Commit fb71e453 authored Sep 15, 2008 by Hiroshi Shimamoto Committed by Ingo Molnar Sep 16, 2008

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>

parent 30742d5c

include/linux/uaccess.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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; \