Commit 3b91270a0a2fe00b7aa1ce16b3ecf055315c64e3
1 parent
5f01feb8b9
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
x86-64: make csum_partial_copy_from_user() error handling consistent
Al Viro pointed out that the x86-64 csum_partial_copy_from_user() is somewhat confused about what it should do on errors, notably it mostly clears the uncopied end result buffer, but misses that for the initial alignment case. All users should check for errors, so it's dubious whether the clearing is even necessary, and Al also points out that we should probably clean up the calling conventions, but regardless of any future changes to this function, the fact that it is inconsistent is just annoying. So make the __get_user() failure path use the same error exit as all the other errors do. Reported-by: Al Viro <viro@zeniv.linux.org.uk> Cc: David Miller <davem@davemloft.net> Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 2 additions and 3 deletions Side-by-side Diff
arch/x86/lib/csum-wrappers_64.c
... | ... | @@ -41,9 +41,8 @@ |
41 | 41 | while (((unsigned long)src & 6) && len >= 2) { |
42 | 42 | __u16 val16; |
43 | 43 | |
44 | - *errp = __get_user(val16, (const __u16 __user *)src); | |
45 | - if (*errp) | |
46 | - return isum; | |
44 | + if (__get_user(val16, (const __u16 __user *)src)) | |
45 | + goto out_err; | |
47 | 46 | |
48 | 47 | *(__u16 *)dst = val16; |
49 | 48 | isum = (__force __wsum)add32_with_carry( |