diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-16 14:33:56 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-02-16 14:33:56 -0800 |
| commit | 937fa613780b0c567c7274f84427d25713804b8e (patch) | |
| tree | a57dd51740eae3e76a3a10654f2679de472978b3 /usb | |
| parent | 8ddf33958e750354317a0cc6ad396a017fb7ce51 (diff) | |
| download | patches-937fa613780b0c567c7274f84427d25713804b8e.tar.gz | |
fuzz
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-bkl-removal-from-ioctl-path-of-usbfs.patch | 10 | ||||
| -rw-r--r-- | usb/usb-reduce-scope-of-bkl-in-usb-ioctl-handling.patch | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usb/usb-bkl-removal-from-ioctl-path-of-usbfs.patch b/usb/usb-bkl-removal-from-ioctl-path-of-usbfs.patch index 0d80a44b05b656..af9202bb247443 100644 --- a/usb/usb-bkl-removal-from-ioctl-path-of-usbfs.patch +++ b/usb/usb-bkl-removal-from-ioctl-path-of-usbfs.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c -@@ -1624,7 +1624,10 @@ static int proc_ioctl(struct dev_state * +@@ -1636,7 +1636,10 @@ static int proc_ioctl(struct dev_state * if (driver == NULL || driver->ioctl == NULL) { retval = -ENOTTY; } else { @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (retval == -ENOIOCTLCMD) retval = -ENOTTY; } -@@ -1708,11 +1711,9 @@ static long usbdev_do_ioctl(struct file +@@ -1720,11 +1723,9 @@ static long usbdev_do_ioctl(struct file if (!(file->f_mode & FMODE_WRITE)) return -EPERM; @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENODEV; } -@@ -1771,12 +1772,10 @@ static long usbdev_do_ioctl(struct file +@@ -1783,12 +1784,10 @@ static long usbdev_do_ioctl(struct file break; case USBDEVFS_SUBMITURB: @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; #ifdef CONFIG_COMPAT -@@ -1828,17 +1827,13 @@ static long usbdev_do_ioctl(struct file +@@ -1840,17 +1839,13 @@ static long usbdev_do_ioctl(struct file break; case USBDEVFS_REAPURB: @@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; case USBDEVFS_DISCSIGNAL: -@@ -1872,7 +1867,6 @@ static long usbdev_do_ioctl(struct file +@@ -1884,7 +1879,6 @@ static long usbdev_do_ioctl(struct file break; } usb_unlock_device(dev); diff --git a/usb/usb-reduce-scope-of-bkl-in-usb-ioctl-handling.patch b/usb/usb-reduce-scope-of-bkl-in-usb-ioctl-handling.patch index 34bcc401d592f7..a105d38238ea7c 100644 --- a/usb/usb-reduce-scope-of-bkl-in-usb-ioctl-handling.patch +++ b/usb/usb-reduce-scope-of-bkl-in-usb-ioctl-handling.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c -@@ -1707,9 +1707,12 @@ static long usbdev_do_ioctl(struct file +@@ -1719,9 +1719,12 @@ static long usbdev_do_ioctl(struct file if (!(file->f_mode & FMODE_WRITE)) return -EPERM; @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENODEV; } -@@ -1768,10 +1771,12 @@ static long usbdev_do_ioctl(struct file +@@ -1780,10 +1783,12 @@ static long usbdev_do_ioctl(struct file break; case USBDEVFS_SUBMITURB: @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; #ifdef CONFIG_COMPAT -@@ -1823,13 +1828,17 @@ static long usbdev_do_ioctl(struct file +@@ -1835,13 +1840,17 @@ static long usbdev_do_ioctl(struct file break; case USBDEVFS_REAPURB: @@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; case USBDEVFS_DISCSIGNAL: -@@ -1863,6 +1872,7 @@ static long usbdev_do_ioctl(struct file +@@ -1875,6 +1884,7 @@ static long usbdev_do_ioctl(struct file break; } usb_unlock_device(dev); @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (ret >= 0) inode->i_atime = CURRENT_TIME; return ret; -@@ -1873,9 +1883,7 @@ static long usbdev_ioctl(struct file *fi +@@ -1885,9 +1895,7 @@ static long usbdev_ioctl(struct file *fi { int ret; @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; } -@@ -1886,9 +1894,7 @@ static long usbdev_compat_ioctl(struct f +@@ -1898,9 +1906,7 @@ static long usbdev_compat_ioctl(struct f { int ret; |