x86, sparse: Do not force removal of __user when calling copy_to/from_user_nocheck()

rostedt · H. Peter Anvin · commit df90ca969035 · 2014-01-04T13:54:50.000-08:00
Commit ff47ab4 "x86: Add 1/2/4/8 byte optimization to 64bit __copy_{from,to}_user_inatomic" added a "_nocheck" call in between the copy_to/from_user() and copy_user_generic(). As both the normal and nocheck versions of theses calls use the proper __user annotation, a typecast to remove it should not be added. This causes sparse to spin out the following warnings: arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2 (different address spaces) arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef] <asn:1>*src arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident> arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2 (different address spaces) arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef] <asn:1>*src arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident> arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2 (different address spaces) arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef] <asn:1>*src arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident> arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2 (different address spaces) arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef] <asn:1>*src arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident> Cc: Andi Kleen <ak@linux.intel.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/20140103164500.5f6478f5@gandalf.local.home Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
@@ -204,13 +204,13 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
 static __must_check __always_inline int
 __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
 {
-	return __copy_from_user_nocheck(dst, (__force const void *)src, size);
+	return __copy_from_user_nocheck(dst, src, size);
 }
 
 static __must_check __always_inline int
 __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
 {
-	return __copy_to_user_nocheck((__force void *)dst, src, size);
+	return __copy_to_user_nocheck(dst, src, size);
 }
 
 extern long __copy_user_nocache(void *dst, const void __user *src,

Original file line number	Diff line number	Diff line change
`@@ -204,13 +204,13 @@ int __copy_in_user(void __user dst, const void __user src, unsigned size)`
`204`	`204`	`static __must_check __always_inline int`
`205`	`205`	`__copy_from_user_inatomic(void dst, const void __user src, unsigned size)`
`206`	`206`	`{`
`207`		`- return __copy_from_user_nocheck(dst, (__force const void *)src, size);`
	`207`	`+ return __copy_from_user_nocheck(dst, src, size);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`static __must_check __always_inline int`
`211`	`211`	`__copy_to_user_inatomic(void __user dst, const void src, unsigned size)`
`212`	`212`	`{`
`213`		`- return __copy_to_user_nocheck((__force void *)dst, src, size);`
	`213`	`+ return __copy_to_user_nocheck(dst, src, size);`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`extern long __copy_user_nocache(void dst, const void __user src,`