@@ -78,6 +78,7 @@ struct usb_dev_state {
int not_yet_resumed;
bool suspend_allowed;
bool privileges_dropped;
+ bool revoked;
};
struct usb_memory {
@@ -237,6 +238,13 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma)
dma_addr_t dma_handle;
int ret;
+ usb_lock_device(ps->dev);
+ if (!connected(ps) || ps->revoked) {
+ usb_unlock_device(ps->dev);
+ return -ENODEV;
+ }
+ usb_unlock_device(ps->dev);
+
ret = usbfs_increase_memory_usage(size + sizeof(struct usb_memory));
if (ret)
goto error;
@@ -298,6 +306,15 @@ static int usbdev_mmap(struct file *file, struct vm_area_struct *vma)
return ret;
}
+static loff_t usbdev_llseek(struct file *file, loff_t offset, int whence)
+{
+ struct usb_dev_state *ps = file->private_data;
+
+ if (!connected(ps) || ps->revoked)
+ return -ENODEV;
+ return no_seek_end_llseek(file, offset, whence);
+}
+
static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
loff_t *ppos)
{
@@ -310,7 +327,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
pos = *ppos;
usb_lock_device(dev);
- if (!connected(ps)) {
+ if (!connected(ps) || ps->revoked) {
ret = -ENODEV;
goto err;
} else if (pos < 0) {
@@ -2117,7 +2134,7 @@ static int proc_reapurbnonblock(struct usb_dev_state *ps, void __user *arg)
retval = processcompl(as, (void __user * __user *)arg);
free_async(as);
} else {
- retval = (connected(ps) ? -EAGAIN : -ENODEV);
+ retval = (connected(ps) && !ps->revoked ? -EAGAIN : -ENODEV);
}
return retval;
}
@@ -2262,7 +2279,7 @@ static int proc_reapurbnonblock_compat(struct usb_dev_state *ps, void __user *ar
retval = processcompl_compat(as, (void __user * __user *)arg);
free_async(as);
} else {
- retval = (connected(ps) ? -EAGAIN : -ENODEV);
+ retval = (connected(ps) && !ps->revoked ? -EAGAIN : -ENODEV);
}
return retval;
}
@@ -2580,6 +2597,82 @@ static int proc_wait_for_resume(struct usb_dev_state *ps)
return proc_forbid_suspend(ps);
}
+static int usbdev_revoke(struct usb_dev_state *ps)
+{
+ struct usb_device *dev = ps->dev;
+ unsigned int ifnum;
+ struct async *as;
+
+ if (ps->revoked) {
+ usb_unlock_device(dev);
+ return -ENODEV;
+ }
+ ps->revoked = true;
+
+ for (ifnum = 0; ps->ifclaimed && ifnum < 8*sizeof(ps->ifclaimed);
+ ifnum++) {
+ if (test_bit(ifnum, &ps->ifclaimed))
+ releaseintf(ps, ifnum);
+ }
+ destroy_all_async(ps);
+
+ as = async_getcompleted(ps);
+ while (as) {
+ free_async(as);
+ as = async_getcompleted(ps);
+ }
+
+ wake_up(&ps->wait);
+
+ snoop(&dev->dev, "%s: REVOKE by PID %d: %s\n", __func__,
+ task_pid_nr(current), current->comm);
+
+ return 0;
+}
+
+int usb_revoke(struct usb_device *udev,
+ struct usb_revoke_match *match)
+{
+ struct usb_dev_state *ps;
+ int ret = -ENOENT;
+
+ usb_lock_device(udev);
+
+ if (match->devnum >= 0 &&
+ match->busnum >= 0) {
+ int devnum, busnum;
+
+ devnum = udev->devnum;
+ busnum = udev->bus->busnum;
+ if (match->busnum != busnum ||
+ match->devnum != devnum) {
+ ret = -ENODEV;
+ goto out;
+ }
+ }
+
+ list_for_each_entry(ps, &udev->filelist, list) {
+ if (match->euid >= 0) {
+ kuid_t kuid;
+
+ if (!ps || !ps->cred)
+ continue;
+ kuid = ps->cred->euid;
+ if (kuid.val != match->euid)
+ continue;
+ }
+
+ if (ret == 0)
+ usbdev_revoke(ps);
+ else
+ ret = usbdev_revoke(ps);
+ }
+
+out:
+ usb_unlock_device(udev);
+ return ret;
+}
+
/*
* NOTE: All requests here that have interface numbers as parameters
* are assuming that somehow the configuration has been prevented from
@@ -2623,7 +2716,7 @@ static long usbdev_do_ioctl(struct file *file, unsigned int cmd,
#endif
}
- if (!connected(ps)) {
+ if (!connected(ps) || ps->revoked) {
usb_unlock_device(dev);
return -ENODEV;
}
@@ -2819,7 +2912,7 @@ static __poll_t usbdev_poll(struct file *file,
poll_wait(file, &ps->wait, wait);
if (file->f_mode & FMODE_WRITE && !list_empty(&ps->async_completed))
mask |= EPOLLOUT | EPOLLWRNORM;
- if (!connected(ps))
+ if (!connected(ps) || ps->revoked)
mask |= EPOLLHUP;
if (list_empty(&ps->list))
mask |= EPOLLERR;
@@ -2828,7 +2921,7 @@ static __poll_t usbdev_poll(struct file *file,
const struct file_operations usbdev_file_operations = {
.owner = THIS_MODULE,
- .llseek = no_seek_end_llseek,
+ .llseek = usbdev_llseek,
.read = usbdev_read,
.poll = usbdev_poll,
.unlocked_ioctl = usbdev_ioctl,
@@ -9,6 +9,11 @@
struct usb_hub_descriptor;
struct usb_dev_state;
+struct usb_revoke_match {
+ int busnum, devnum; /* -1 to match all devices */
+ int euid; /* -1 to match all users */
+};
+
/* Functions local to drivers/usb/core/ */
extern int usb_create_sysfs_dev_files(struct usb_device *dev);
@@ -34,6 +39,9 @@ extern int usb_deauthorize_device(struct usb_device *);
extern int usb_authorize_device(struct usb_device *);
extern void usb_deauthorize_interface(struct usb_interface *);
extern void usb_authorize_interface(struct usb_interface *);
+extern int usb_revoke(struct usb_device *udev,
+ struct usb_revoke_match *match);
+extern int usbdev_get_uid(struct usb_dev_state *ps);
extern void usb_detect_quirks(struct usb_device *udev);
extern void usb_detect_interface_quirks(struct usb_device *udev);
extern void usb_release_quirk_list(void);
There is a need for userspace applications to open USB devices directly, for all the USB devices without a kernel-level class driver[1], and implemented in user-space. As not all devices are built equal, we want to be able to revoke access to those devices whether it's because the user isn't at the console anymore, or because the web browser, or sandbox doesn't want to allow access to that device. This commit implements the internal API used to revoke access to USB devices, given either bus and device numbers, or/and a user's effective UID. Signed-off-by: Bastien Nocera <hadess@hadess.net> [1]: Non exhaustive list of devices and device types that need raw USB access: - all manners of single-board computers and programmable chips and devices (avrdude, STLink, sunxi bootloader, flashrom, etc.) - 3D printers - scanners - LCD "displays" - user-space webcam and still cameras - game controllers - video/audio capture devices - sensors - software-defined radios - DJ/music equipment - protocol analysers - Rio 500 music player --- drivers/usb/core/devio.c | 105 ++++++++++++++++++++++++++++++++++++--- drivers/usb/core/usb.h | 8 +++ 2 files changed, 107 insertions(+), 6 deletions(-)