diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-01-13 14:55:07 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-01-13 14:55:07 +0000 |
commit | b49e97601bba8ba4075085b69e00952373e18af2 (patch) | |
tree | 322fc313a19bc903c788a7acf9b6fabef06b04e5 /target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch | |
parent | ef7ec19360f373ead4bffc66c10fd70ec6c1aa78 (diff) | |
download | upstream-b49e97601bba8ba4075085b69e00952373e18af2.tar.gz upstream-b49e97601bba8ba4075085b69e00952373e18af2.tar.bz2 upstream-b49e97601bba8ba4075085b69e00952373e18af2.zip |
kernel: add support for linux 3.2.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29730 3c298f89-4303-0410-b956-a3cf2f4a3e73
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, 29 insertions, 0 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 new file mode 100644 index 0000000000..fa261ce648 --- /dev/null +++ b/target/linux/generic/patches-3.2/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch @@ -0,0 +1,29 @@ +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; |