x86: switch 32bit csum_and_copy_to_user() to user_access_{begin,end}() (c281a6c1) · Commits · 戴 / test

arch/x86/include/asm/checksum.h

+1 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER 1
		#define HAVE_CSUM_COPY_USER
		#ifdef CONFIG_X86_32
		# include <asm/checksum_32.h>
		#else

+2 −4

Original line number	Diff line number	Diff line
		@@ -176,7 +176,6 @@ static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
		/*
		* Copy and checksum to user
		*/
		#define HAVE_CSUM_COPY_USER
		static inline __wsum csum_and_copy_to_user(const void *src,
		void __user *dst,
		int len, __wsum sum,
		@@ -185,11 +184,10 @@ static inline __wsum csum_and_copy_to_user(const void *src,
		__wsum ret;

		might_sleep();
		if (access_ok(dst, len)) {
		stac();
		if (user_access_begin(dst, len)) {
		ret = csum_partial_copy_generic(src, (__force void *)dst,
		len, sum, NULL, err_ptr);
		clac();
		user_access_end();
		return ret;
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -129,9 +129,6 @@ static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
		*/
		extern __wsum csum_partial(const void *buff, int len, __wsum sum);

		#define HAVE_CSUM_COPY_USER 1


		/* Do not call this directly. Use the wrappers below */
		extern __visible __wsum csum_partial_copy_generic(const void src, const void dst,
		int len, __wsum sum,