diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-01 12:36:22 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-01 12:36:22 +1000 |
| commit | 1f59cc3482c645c956a06e1b587e49df8d42ebab (patch) | |
| tree | 2496b1c256ed6a61431c6fbd1738ddec92c0b578 /lib/strncpy_from_user.c | |
| parent | 17bc43367fc2a720400d21c745db641c654c1e6b (diff) | |
| parent | b44f687386875b714dae2afa768e73401e45c21c (diff) | |
Merge branch 'topic/uaccess' into topic/uaccess-ppc
Merge the generic changes to add user_[read|write]_access_begin().
Diffstat (limited to 'lib/strncpy_from_user.c')
| -rw-r--r-- | lib/strncpy_from_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c index 706020b06617..b90ec550183a 100644 --- a/lib/strncpy_from_user.c +++ b/lib/strncpy_from_user.c @@ -116,9 +116,9 @@ long strncpy_from_user(char *dst, const char __user *src, long count) kasan_check_write(dst, count); check_object_size(dst, count, false); - if (user_access_begin(src, max)) { + if (user_read_access_begin(src, max)) { retval = do_strncpy_from_user(dst, src, count, max); - user_access_end(); + user_read_access_end(); return retval; } } |