projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
lib
/
strncpy_from_user.c
diff --git
a/lib/strncpy_from_user.c
b/lib/strncpy_from_user.c
index 5a003a2ebd967cfe6a9e202ea9a1ae7f1ddf1aba..05efc1fa97f08941d763996d38ce08afbbaba459 100644
(file)
--- a/
lib/strncpy_from_user.c
+++ b/
lib/strncpy_from_user.c
@@
-1,5
+1,6
@@
#include <linux/compiler.h>
#include <linux/export.h>
#include <linux/compiler.h>
#include <linux/export.h>
+#include <linux/thread_info.h>
#include <linux/uaccess.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/uaccess.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-109,6
+110,7
@@
long strncpy_from_user(char *dst, const char __user *src, long count)
unsigned long max = max_addr - src_addr;
long retval;
unsigned long max = max_addr - src_addr;
long retval;
+ check_object_size(dst, count, false);
user_access_begin();
retval = do_strncpy_from_user(dst, src, count, max);
user_access_end();
user_access_begin();
retval = do_strncpy_from_user(dst, src, count, max);
user_access_end();