| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20191203010521.220577-1-abhishekpandit@chromium.org>
Date: Mon, 2 Dec 2019 17:05:21 -0800
From: Abhishek Pandit-Subedi <abhishekpandit@...omium.org>
To: linux-input@...r.kernel.org
Cc: Pali Rohár <pali.rohar@...il.com>,
linux-bluetooth@...r.kernel.org,
Luiz Augusto von Dentz <luiz.dentz@...il.com>,
Abhishek Pandit-Subedi <abhishekpandit@...omium.org>,
linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
Logan Gunthorpe <logang@...tatee.com>,
Alexandre Belloni <alexandre.belloni@...tlin.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Andrey Smirnov <andrew.smirnov@...il.com>,
Kirill Smelkov <kirr@...edi.com>
Subject: [PATCH v2] Input: uinput - Add UI_SET_UNIQ ioctl handler
Support setting the uniq attribute of the input device. The uniq
attribute is used as a unique identifier for the connected device.
For example, uinput devices created by BlueZ will store the address of
the connected device as the uniq property.
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@...omium.org>
---
Hi input maintainers,
I added this change to allow BlueZ to display the peer device address in
udev. BlueZ has been setting ATTR{name} to the peer address since it
isn't possible to set the uniq attribute currently.
I've tested this on a Chromebook running kernel v4.19 with this patch.
$ uname -r
4.19.85
$ dmesg | grep "input:" | tail -1
[ 69.604752] input: BeatsStudio Wireless as /devices/virtual/input/input17
$ udevadm info -a -p /sys/devices/virtual/input/input17
Udevadm info starts with the device specified by the devpath and then
walks up the chain of parent devices. It prints for every device
found, all possible attributes in the udev rules key format.
A rule to match, can be composed by the attributes of the device
and the attributes from one single parent device.
looking at device '/devices/virtual/input/input17':
KERNEL=="input17"
SUBSYSTEM=="input"
DRIVER==""
ATTR{inhibited}=="0"
ATTR{name}=="BeatsStudio Wireless"
ATTR{phys}=="00:00:00:6e:d0:74"
ATTR{properties}=="0"
ATTR{uniq}=="00:00:00:cc:1c:f3"
(I zeroed out part of the addresses above. The phys attribute
corresponds to the address of the Bluetooth controller on the Chromebook
and the uniq is the address of the headphones)
Changes in v2:
- Added compat handling for UI_SET_UNIQ
drivers/input/misc/uinput.c | 26 +++++++++++++++++++++++++-
include/uapi/linux/uinput.h | 1 +
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 84051f20b18a..a7cbf5726a36 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -280,7 +280,7 @@ static int uinput_dev_flush(struct input_dev *dev, struct file *file)
static void uinput_destroy_device(struct uinput_device *udev)
{
- const char *name, *phys;
+ const char *name, *phys, *uniq;
struct input_dev *dev = udev->dev;
enum uinput_state old_state = udev->state;
@@ -289,6 +289,7 @@ static void uinput_destroy_device(struct uinput_device *udev)
if (dev) {
name = dev->name;
phys = dev->phys;
+ uniq = dev->uniq;
if (old_state == UIST_CREATED) {
uinput_flush_requests(udev);
input_unregister_device(dev);
@@ -297,6 +298,7 @@ static void uinput_destroy_device(struct uinput_device *udev)
}
kfree(name);
kfree(phys);
+ kfree(uniq);
udev->dev = NULL;
}
}
@@ -840,6 +842,7 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
struct uinput_ff_erase ff_erase;
struct uinput_request *req;
char *phys;
+ char *uniq;
const char *name;
unsigned int size;
@@ -931,6 +934,22 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd,
udev->dev->phys = phys;
goto out;
+ case UI_SET_UNIQ:
+ if (udev->state == UIST_CREATED) {
+ retval = -EINVAL;
+ goto out;
+ }
+
+ uniq = strndup_user(p, 1024);
+ if (IS_ERR(uniq)) {
+ retval = PTR_ERR(uniq);
+ goto out;
+ }
+
+ kfree(udev->dev->uniq);
+ udev->dev->uniq = uniq;
+ goto out;
+
case UI_BEGIN_FF_UPLOAD:
retval = uinput_ff_upload_from_user(p, &ff_up);
if (retval)
@@ -1044,6 +1063,8 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
*/
#define UI_SET_PHYS_COMPAT \
_IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t)
+#define UI_SET_UNIQ_COMPAT \
+ _IOW(UINPUT_IOCTL_BASE, 111, compat_uptr_t)
#define UI_BEGIN_FF_UPLOAD_COMPAT \
_IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload_compat)
#define UI_END_FF_UPLOAD_COMPAT \
@@ -1056,6 +1077,9 @@ static long uinput_compat_ioctl(struct file *file,
case UI_SET_PHYS_COMPAT:
cmd = UI_SET_PHYS;
break;
+ case UI_SET_UNIQ_COMPAT:
+ cmd = UI_SET_UNIQ;
+ break;
case UI_BEGIN_FF_UPLOAD_COMPAT:
cmd = UI_BEGIN_FF_UPLOAD;
break;
diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h
index c9e677e3af1d..d5b7767c1b02 100644
--- a/include/uapi/linux/uinput.h
+++ b/include/uapi/linux/uinput.h
@@ -145,6 +145,7 @@ struct uinput_abs_setup {
#define UI_SET_PHYS _IOW(UINPUT_IOCTL_BASE, 108, char*)
#define UI_SET_SWBIT _IOW(UINPUT_IOCTL_BASE, 109, int)
#define UI_SET_PROPBIT _IOW(UINPUT_IOCTL_BASE, 110, int)
+#define UI_SET_UNIQ _IOW(UINPUT_IOCTL_BASE, 111, char*)
#define UI_BEGIN_FF_UPLOAD _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload)
#define UI_END_FF_UPLOAD _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload)
--
2.24.0.393.g34dc348eaf-goog
Powered by blists - more mailing lists