diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-09-24 18:14:12 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-09-24 18:14:12 +0800 |
commit | daa56e80f38501651e9fd9d7f76920c4e9f5c6e9 (patch) | |
tree | db92f168af25936a0090713b43dad341f7f8e339 /lib/strncpy_from_user.c | |
parent | d2d693d1ba7d93ec7c5db8aca2da29a4c91f6782 (diff) | |
parent | ed67fb82b17db1f5e3c7818e10560814c7d2e019 (diff) |
Merge branch 'v4.4/topic/mm-kaslr-pax_usercopy' into linux-linaro-lsk-v4.4lsk-v4.4-16.09
Diffstat (limited to 'lib/strncpy_from_user.c')
-rw-r--r-- | lib/strncpy_from_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c index 33840324138c..5a003a2ebd96 100644 --- a/lib/strncpy_from_user.c +++ b/lib/strncpy_from_user.c @@ -39,8 +39,8 @@ static inline long do_strncpy_from_user(char *dst, const char __user *src, long unsigned long c, data; /* Fall back to byte-at-a-time if we get a page fault */ - if (unlikely(unsafe_get_user(c,(unsigned long __user *)(src+res)))) - break; + unsafe_get_user(c, (unsigned long __user *)(src+res), byte_at_a_time); + *(unsigned long *)(dst+res) = c; if (has_zero(c, &data, &constants)) { data = prep_zero_mask(c, data, &constants); @@ -55,8 +55,7 @@ byte_at_a_time: while (max) { char c; - if (unlikely(unsafe_get_user(c,src+res))) - return -EFAULT; + unsafe_get_user(c,src+res, efault); dst[res] = c; if (!c) return res; @@ -75,6 +74,7 @@ byte_at_a_time: * Nope: we hit the address space limit, and we still had more * characters the caller would have wanted. That's an EFAULT. */ +efault: return -EFAULT; } |