riscv: split the declaration of __copy_user

lucvoo · palmer-dabbelt · commit 86406d51d360 · 2018-06-09T12:34:31.000-07:00
We use a single __copy_user assembly function to copy memory both from
and to userspace. While this works, it triggers sparse errors because
we're implicitly casting between the kernel and user address spaces by
calling __copy_user.

This patch splits the C declaration into a pair of functions,
__asm_copy_{to,from}_user, that have sane semantics WRT __user. This
split make things fine from sparse's point of view. The assembly
implementation keeps a single definition but add a double ENTRY() for it,
one for __asm_copy_to_user and another one for __asm_copy_from_user.
The result is a spare-safe implementation that pays no performance
or code size penalty.

Signed-off-by: Luc Van Oostenryck &lt;luc.vanoostenryck@gmail.com&gt;
Signed-off-by: Palmer Dabbelt &lt;palmer@sifive.com&gt;
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
@@ -392,19 +392,21 @@ do {								\
 })
 
 
-extern unsigned long __must_check __copy_user(void __user *to,
+extern unsigned long __must_check __asm_copy_to_user(void __user *to,
+	const void *from, unsigned long n);
+extern unsigned long __must_check __asm_copy_from_user(void *to,
 	const void __user *from, unsigned long n);
 
 static inline unsigned long
 raw_copy_from_user(void *to, const void __user *from, unsigned long n)
 {
-	return __copy_user(to, from, n);
+	return __asm_copy_to_user(to, from, n);
 }
 
 static inline unsigned long
 raw_copy_to_user(void __user *to, const void *from, unsigned long n)
 {
-	return __copy_user(to, from, n);
+	return __asm_copy_from_user(to, from, n);
 }
 
 extern long strncpy_from_user(char *dest, const char __user *src, long count);
diff --git a/arch/riscv/kernel/riscv_ksyms.c b/arch/riscv/kernel/riscv_ksyms.c
@@ -13,6 +13,7 @@
  * Assembly functions that may be used (directly or indirectly) by modules
  */
 EXPORT_SYMBOL(__clear_user);
-EXPORT_SYMBOL(__copy_user);
+EXPORT_SYMBOL(__asm_copy_to_user);
+EXPORT_SYMBOL(__asm_copy_from_user);
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(memcpy);
diff --git a/arch/riscv/lib/uaccess.S b/arch/riscv/lib/uaccess.S
@@ -13,7 +13,8 @@ _epc:
 	.previous
 	.endm
 
-ENTRY(__copy_user)
+ENTRY(__asm_copy_to_user)
+ENTRY(__asm_copy_from_user)
 
 	/* Enable access to user memory */
 	li t6, SR_SUM
@@ -63,7 +64,8 @@ ENTRY(__copy_user)
 	addi a0, a0, 1
 	bltu a1, a3, 5b
 	j 3b
-ENDPROC(__copy_user)
+ENDPROC(__asm_copy_to_user)
+ENDPROC(__asm_copy_from_user)
 
 
 ENTRY(__clear_user)

Original file line number	Diff line number	Diff line change
`@@ -392,19 +392,21 @@ do { \`
`392`	`392`	`})`
`393`	`393`
`394`	`394`
`395`		`-extern unsigned long __must_check __copy_user(void __user *to,`
	`395`	`+extern unsigned long __must_check __asm_copy_to_user(void __user *to,`
	`396`	`+ const void *from, unsigned long n);`
	`397`	`+extern unsigned long __must_check __asm_copy_from_user(void *to,`
`396`	`398`	`const void __user *from, unsigned long n);`
`397`	`399`
`398`	`400`	`static inline unsigned long`
`399`	`401`	`raw_copy_from_user(void to, const void __user from, unsigned long n)`
`400`	`402`	`{`
`401`		`- return __copy_user(to, from, n);`
	`403`	`+ return __asm_copy_to_user(to, from, n);`
`402`	`404`	`}`
`403`	`405`
`404`	`406`	`static inline unsigned long`
`405`	`407`	`raw_copy_to_user(void __user to, const void from, unsigned long n)`
`406`	`408`	`{`
`407`		`- return __copy_user(to, from, n);`
	`409`	`+ return __asm_copy_from_user(to, from, n);`
`408`	`410`	`}`
`409`	`411`
`410`	`412`	`extern long strncpy_from_user(char dest, const char __user src, long count);`