projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make 'user_access_begin()' do 'access_ok()'
[linux-2.6-microblaze.git]
/
lib
/
strncpy_from_user.c
diff --git
a/lib/strncpy_from_user.c
b/lib/strncpy_from_user.c
index
b53e1b5
..
58eacd4
100644
(file)
--- a/
lib/strncpy_from_user.c
+++ b/
lib/strncpy_from_user.c
@@
-114,10
+114,11
@@
long strncpy_from_user(char *dst, const char __user *src, long count)
kasan_check_write(dst, count);
check_object_size(dst, count, false);
kasan_check_write(dst, count);
check_object_size(dst, count, false);
- user_access_begin();
- retval = do_strncpy_from_user(dst, src, count, max);
- user_access_end();
- return retval;
+ if (user_access_begin(src, max)) {
+ retval = do_strncpy_from_user(dst, src, count, max);
+ user_access_end();
+ return retval;
+ }
}
return -EFAULT;
}
}
return -EFAULT;
}