diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:37 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-27 15:01:37 +0000 |
commit | 0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c (patch) | |
tree | d82196ea551155c8f21cfa5fef4fa565d29f4b0b /target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch | |
parent | 20ba6d90e31707ee95630804a284c8bad8cc90ed (diff) | |
download | upstream-0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c.tar.gz upstream-0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c.tar.bz2 upstream-0b8c1c8dfbbd6a86be4b12bf4a625f44e75a461c.zip |
linux/3.2: R.I.P.
SVN-Revision: 31905
Diffstat (limited to 'target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch')
-rw-r--r-- | target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch b/target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch deleted file mode 100644 index fa261ce648..0000000000 --- a/target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch +++ /dev/null @@ -1,29 +0,0 @@ -According to the include/linux/watchdog.h WDIOC_SETOPTIONS is -classified as 'read from device' ioctl call: - #define WDIOC_SETOPTIONS _IOR(WATCHDOG_IOCTL_BASE, 4, int) - -However, the driver 'mpcore_wdt' performs 'copy_from_user' only if -_IOC_WRITE is set, thus the local variable 'uarg' which is used in -WDIOC_SETOPTIONS handling remains uninitialized. - -The proper way to fix this is to bind WDIOC_SETOPTIONS to _IOW, -but this will break compatibility. -So adding additional condition for performing 'copy_from_user'. - -Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> ---- - drivers/watchdog/mpcore_wdt.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - ---- a/drivers/watchdog/mpcore_wdt.c -+++ b/drivers/watchdog/mpcore_wdt.c -@@ -233,7 +233,8 @@ static long mpcore_wdt_ioctl(struct file - if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg)) - return -ENOTTY; - -- if (_IOC_DIR(cmd) & _IOC_WRITE) { -+ if ((_IOC_DIR(cmd) & _IOC_WRITE) -+ || cmd == WDIOC_SETOPTIONS) { - ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd)); - if (ret) - return -EFAULT; |