sh32: convert to csum_and_copy_from_user()

Al Viro · Al Viro · commit 7fe8970a78a1 · 2020-05-29T16:11:49.000-04:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/arch/sh/include/asm/checksum_32.h b/arch/sh/include/asm/checksum_32.h
@@ -48,12 +48,17 @@ __wsum csum_partial_copy_nocheck(const void *src, void *dst,
 	return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);
 }
 
+#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
 static inline
-__wsum csum_partial_copy_from_user(const void __user *src, void *dst,
+__wsum csum_and_copy_from_user(const void __user *src, void *dst,
 				   int len, __wsum sum, int *err_ptr)
 {
-	return csum_partial_copy_generic((__force const void *)src, dst,
+	if (access_ok(src, len))
+		return csum_partial_copy_generic((__force const void *)src, dst,
 					len, sum, err_ptr, NULL);
+	if (len)
+		*err_ptr = -EFAULT;
+	return sum;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,17 @@ __wsum csum_partial_copy_nocheck(const void src, void dst,`
`48`	`48`	`return csum_partial_copy_generic(src, dst, len, sum, NULL, NULL);`
`49`	`49`	`}`
`50`	`50`
	`51`	`+#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER`
`51`	`52`	`static inline`
`52`		`-__wsum csum_partial_copy_from_user(const void __user src, void dst,`
	`53`	`+__wsum csum_and_copy_from_user(const void __user src, void dst,`
`53`	`54`	`int len, __wsum sum, int *err_ptr)`
`54`	`55`	`{`
`55`		`- return csum_partial_copy_generic((__force const void *)src, dst,`
	`56`	`+ if (access_ok(src, len))`
	`57`	`+ return csum_partial_copy_generic((__force const void *)src, dst,`
`56`	`58`	`len, sum, err_ptr, NULL);`
	`59`	`+ if (len)`
	`60`	`+ *err_ptr = -EFAULT;`
	`61`	`+ return sum;`
`57`	`62`	`}`
`58`	`63`
`59`	`64`	`/*`