diff options
| author |   Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2008-09-15 18:04:26 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-09-16 07:44:46 +0200 |
| commit | fb71e45338453698bd7460f7e8f171ea0304d218 (patch) | |
| tree | 382230161077e175e3c1c8f9e2b0632f185cd9c8 /include/linux/uaccess.h | |
| parent | Revert "lockdep: fix compilation when CONFIG_TRACE_IRQFLAGS_SUPPORT is not set" (diff) | |
| download | linux-dev-fb71e45338453698bd7460f7e8f171ea0304d218.tar.xz linux-dev-fb71e45338453698bd7460f7e8f171ea0304d218.zip | |
uaccess: fix parameters inversion for __copy_from_user_inatomic()
The following patch changes to use __copy_from_user_inatomic(),
but the passing parameters incorrect:
x86: some lock annotations for user copy paths, v3
This fixes the netfilter crash reported by Steven Noonan.
Reported-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Tested-by: Steven Noonan <steven@uplinklabs.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/uaccess.h')
| -rw-r--r-- | include/linux/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 2062293e57e6..6b58367d145e 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -78,7 +78,7 @@ static inline unsigned long __copy_from_user_nocache(void *to, \ set_fs(KERNEL_DS); \ pagefault_disable(); \ - ret = __copy_from_user_inatomic((__force typeof(retval) __user *)(addr), &(retval), sizeof(retval)); \ + ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \ pagefault_enable(); \ set_fs(old_fs); \ ret; \ |