Commit c953d60b authored Jul 24, 2020 by Linus Torvalds

vfs into master

Pull xtensa csum regression fix from Al Viro:
 "Max Filippov caught a breakage introduced in xtensa this cycle
  by the csum_and_copy_..._user() series.

  Cut'n'paste from the wrong source - the check that belongs
  in csum_and_copy_to_user() ended up both there and in
  csum_and_copy_from_user()"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  xtensa: fix access check in csum_and_copy_from_user

parents c6d68604 5fff09bc

arch/xtensa/include/asm/checksum.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ static inline
		__wsum csum_and_copy_from_user(const void __user src, void dst,
		int len, __wsum sum, int *err_ptr)
		{
		if (access_ok(dst, len))
		if (access_ok(src, len))
		return csum_partial_copy_generic((__force const void *)src, dst,
		len, sum, err_ptr, NULL);
		if (len)

Admin message