Commit 4b01285e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'uaccess.csum' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull uaccess/csum updates from Al Viro:
 "Regularize the sitation with uaccess checksum primitives:

   - fold csum_partial_... into csum_and_copy_..._user()

   - on x86 collapse several access_ok()/stac()/clac() into
     user_access_begin()/user_access_end()"

* 'uaccess.csum' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  default csum_and_copy_to_user(): don't bother with access_ok()
  take the dummy csum_and_copy_from_user() into net/checksum.h
  arm: switch to csum_and_copy_from_user()
  sh32: convert to csum_and_copy_from_user()
  m68k: convert to csum_and_copy_from_user()
  xtensa: switch to providing csum_and_copy_from_user()
  sparc: switch to providing csum_and_copy_from_user()
  parisc: turn csum_partial_copy_from_user() into csum_and_copy_from_user()
  alpha: turn csum_partial_copy_from_user() into csum_and_copy_from_user()
  ia64: turn csum_partial_copy_from_user() into csum_and_copy_from_user()
  ia64: csum_partial_copy_nocheck(): don't abuse csum_partial_copy_from_user()
  x86: switch 32bit csum_and_copy_to_user() to user_access_{begin,end}()
  x86: switch both 32bit and 64bit to providing csum_and_copy_from_user()
  x86_64: csum_..._copy_..._user(): switch to unsafe_..._user()
  get rid of csum_partial_copy_to_user()
parents b23c4771 001c1a65

arch/alpha/include/asm/checksum.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum); 
 * here even more important to align src and dst on a 32-bit (or even

 * better 64-bit) boundary

 */

__wsum csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *errp);

#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER

__wsum csum_and_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *errp);



__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);

arch/alpha/lib/csum_partial_copy.c

+3 −3
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ csum_partial_cfu_unaligned(const unsigned long __user * src, 
}



__wsum

csum_partial_copy_from_user(const void __user *src, void *dst, int len,

csum_and_copy_from_user(const void __user *src, void *dst, int len,

			       __wsum sum, int *errp)

{

	unsigned long checksum = (__force u32) sum;
@@ -369,7 +369,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len, 
	}

	return (__force __wsum)checksum;

}

EXPORT_SYMBOL(csum_partial_copy_from_user);

EXPORT_SYMBOL(csum_and_copy_from_user);



__wsum

csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
@@ -377,7 +377,7 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) 
	__wsum checksum;

	mm_segment_t oldfs = get_fs();

	set_fs(KERNEL_DS);

	checksum = csum_partial_copy_from_user((__force const void __user *)src,

	checksum = csum_and_copy_from_user((__force const void __user *)src,

						dst, len, sum, NULL);

	set_fs(oldfs);

	return checksum;

arch/arm/include/asm/checksum.h

+14 −0
Original line number Diff line number Diff line
@@ -40,6 +40,20 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum); 
__wsum

csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);



#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER

static inline

__wsum csum_and_copy_from_user (const void __user *src, void *dst,

				      int len, __wsum sum, int *err_ptr)

{

	if (access_ok(src, len))

		return csum_partial_copy_from_user(src, dst, len, sum, err_ptr);



	if (len)

		*err_ptr = -EFAULT;



	return sum;

}



/*

 * 	Fold a partial checksum without adding pseudo headers

 */

arch/c6x/lib/checksum.c

+0 −22
Original line number Diff line number Diff line
@@ -4,28 +4,6 @@ 
#include <linux/module.h>

#include <net/checksum.h>



#include <asm/byteorder.h>



/*

 * copy from fs while checksumming, otherwise like csum_partial

 */

__wsum

csum_partial_copy_from_user(const void __user *src, void *dst, int len,

			    __wsum sum, int *csum_err)

{

	int missing;



	missing = __copy_from_user(dst, src, len);

	if (missing) {

		memset(dst + len - missing, 0, missing);

		*csum_err = -EFAULT;

	} else

		*csum_err = 0;



	return csum_partial(dst, len, sum);

}

EXPORT_SYMBOL(csum_partial_copy_from_user);



/* These are from csum_64plus.S */

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy);

arch/ia64/include/asm/checksum.h

+0 −10
Original line number Diff line number Diff line
@@ -37,16 +37,6 @@ extern __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, 
 */

extern __wsum csum_partial(const void *buff, int len, __wsum sum);



/*

 * Same as csum_partial, but copies from src while it checksums.

 *

 * Here it is even more important to align src and dst on a 32-bit (or

 * even better 64-bit) boundary.

 */

extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst,

						 int len, __wsum sum,

						 int *errp);



extern __wsum csum_partial_copy_nocheck(const void *src, void *dst,

					       int len, __wsum sum);

CRA Git | Maintained and supported by SUSTech CRA and CCSE