iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alpha: Prevent a NULL ptr dereference in csum_partial_copy.

Browse Source 
Introduced by 3ddc5b46a8 ("kernel-wide: fix missing validations
on __get/__put/__copy_to/__copy_from_user()").

Also fix some other places which could be problematic in a similar way,
although they hadn't been proved so, as far as I can tell.

Cc: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Jay Estabrook 2013-11-16 16:45:31 -08:00 committed by Matt Turner
parent 6e22f8f2e8
commit 5cfe8f1ba5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/alpha/lib/csum_partial_copy.c
View File

@ -130,7 +130,7 @@ csum_partial_cfu_aligned(const unsigned long __user *src, unsigned long *dst,
*dst = word | tmp; *dst = word | tmp;
checksum += carry; checksum += carry;
} }
if (err) *errp = err; if (err && errp) *errp = err;
return checksum; return checksum;
} }
@ -185,7 +185,7 @@ csum_partial_cfu_dest_aligned(const unsigned long __user *src,
*dst = word | tmp; *dst = word | tmp;
checksum += carry; checksum += carry;
} }
if (err) *errp = err; if (err && errp) *errp = err;
return checksum; return checksum;
} }
@ -242,7 +242,7 @@ csum_partial_cfu_src_aligned(const unsigned long __user *src,
stq_u(partial_dest | second_dest, dst); stq_u(partial_dest | second_dest, dst);
out: out:
checksum += carry; checksum += carry;
if (err) *errp = err; if (err && errp) *errp = err;
return checksum; return checksum;
} }
@ -325,7 +325,7 @@ csum_partial_cfu_unaligned(const unsigned long __user * src,
stq_u(partial_dest | word | second_dest, dst); stq_u(partial_dest | word | second_dest, dst);
checksum += carry; checksum += carry;
} }
if (err) *errp = err; if (err && errp) *errp = err;
return checksum; return checksum;
} }
@ -339,7 +339,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len,
if (len) { if (len) {
if (!access_ok(VERIFY_READ, src, len)) { if (!access_ok(VERIFY_READ, src, len)) {
*errp = -EFAULT; if (errp) *errp = -EFAULT;
memset(dst, 0, len); memset(dst, 0, len);
return sum; return sum;
} }