Sfoglia il codice sorgente

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>
Hiroshi Shimamoto 16 anni fa
parent
commit
fb71e45338
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  1. 1 1
      include/linux/uaccess.h

+ 1 - 1
include/linux/uaccess.h

@@ -78,7 +78,7 @@ static inline unsigned long __copy_from_user_nocache(void *to,
 							\
 							\
 		set_fs(KERNEL_DS);			\
 		set_fs(KERNEL_DS);			\
 		pagefault_disable();			\
 		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();			\
 		pagefault_enable();			\
 		set_fs(old_fs);				\
 		set_fs(old_fs);				\
 		ret;					\
 		ret;					\