firewire: cdev: fix information leak
PATCH 1/1 firewire: cdev: fix information leak
In reply to a message not in the archiveA userspace client got to see uninitialized stack-allocated memory if it specified an _IOC_READ type of ioctl and an argument size larger than expected by firewire-core's ioctl handlers (but not larger than the core's union ioctl_arg).
Fix this by clearing the requested buffer size to zero, but only at _IOR ioctls. This way, there is almost no runtime penalty to legit ioctls. The only legit _IOR is FW_CDEV_IOC_GET_CYCLE_TIMER with 12...16 bytes to memset.
[Another way to fix this would be strict checking of argument size (and possibly direction) vs. command number. However, we then need a lookup table, and we need to allow for slight size deviations in case of 32bit userland on 64bit kernel.]
--- drivers/firewire/core-cdev.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/firewire/core-cdev.c +10 -8
@@ -1346,41 +1346,43 @@ static int (* const ioctl_handlers[])(ststatic int dispatch_ioctl (struct client *client,unsigned int cmd,void __user *arg) {union ioctl_arg buffer;int ret;if (fw_device_is_shutdown (client->device))return -ENODEV ;if (_IOC_TYPE (cmd) !='#' ||_IOC_NR (cmd) >=ARRAY_SIZE (ioctl_handlers))return -EINVAL ; -if (_IOC_DIR (cmd) & _IOC_WRITE) { -if (_IOC_SIZE (cmd) >sizeof (buffer) || -copy_from_user (&buffer, arg,_IOC_SIZE (cmd))) +if (_IOC_SIZE (cmd) >sizeof (buffer)) +return -EFAULT ; + +if (_IOC_DIR (cmd) == _IOC_READ) +memset (&buffer,0 ,_IOC_SIZE (cmd)); + +if (_IOC_DIR (cmd) & _IOC_WRITE) +if (copy_from_user (&buffer, arg,_IOC_SIZE (cmd)))return -EFAULT ; - } ret = ioctl_handlers[_IOC_NR (cmd)](client, &buffer);if (ret <0 )return ret; -if (_IOC_DIR (cmd) & _IOC_READ) { -if (_IOC_SIZE (cmd) >sizeof (buffer) || -copy_to_user (arg, &buffer,_IOC_SIZE (cmd))) +if (_IOC_DIR (cmd) & _IOC_READ) +if (copy_to_user (arg, &buffer,_IOC_SIZE (cmd)))return -EFAULT ; - }return ret; }static long fw_device_op_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {return dispatch_ioctl (file->private_data, cmd, (void __user *)arg); }#ifdef CONFIG_COMPAT static long fw_device_op_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg)
Signature · 3 lines
Stefan Richter -=====-==-=- -=-- --==- http://arcgraph.de/sr/
Quoted 11 lines · Stefan Richter
drivers/firewire/core-cdev.c +0
-0@@ -1346,41 +1346,43 @@ static int (* const ioctl_handlers[])(ststatic int dispatch_ioctl (struct client *client,unsigned int cmd,void __user *arg) {union ioctl_arg buffer;int ret;if (fw_device_is_shutdown (client->device))return -ENODEV ;
drivers/firewire/core-cdev.c static int (* const ioctl_handlers[])(st · line 1360
Quoted 10 lines
drivers/firewire/core-cdev.c +2
-3if (_IOC_TYPE (cmd) !='#' ||_IOC_NR (cmd) >=ARRAY_SIZE (ioctl_handlers))return -EINVAL ; -if (_IOC_DIR (cmd) & _IOC_WRITE) { -if (_IOC_SIZE (cmd) >sizeof (buffer) || -copy_from_user (&buffer, arg,_IOC_SIZE (cmd))) +if (_IOC_SIZE (cmd) >sizeof (buffer)) +return -EFAULT ;
I'll combine this into the preceding -EINVAL return. Cf. man ioctl.
Quoted 23 lines
drivers/firewire/core-cdev.c +8
-5+ +if (_IOC_DIR (cmd) == _IOC_READ) +memset (&buffer,0 ,_IOC_SIZE (cmd)); + +if (_IOC_DIR (cmd) & _IOC_WRITE) +if (copy_from_user (&buffer, arg,_IOC_SIZE (cmd)))return -EFAULT ; - } ret = ioctl_handlers[_IOC_NR (cmd)](client, &buffer);if (ret <0 )return ret; -if (_IOC_DIR (cmd) & _IOC_READ) { -if (_IOC_SIZE (cmd) >sizeof (buffer) || -copy_to_user (arg, &buffer,_IOC_SIZE (cmd))) +if (_IOC_DIR (cmd) & _IOC_READ) +if (copy_to_user (arg, &buffer,_IOC_SIZE (cmd)))return -EFAULT ; - }return ret; }
Signature · 3 lines
Stefan Richter -=====-==-=- -=-- --=== http://arcgraph.de/sr/