projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: harden strncpy_from_user
[cascardo/linux.git]
/
lib
/
strncpy_from_user.c
diff --git
a/lib/strncpy_from_user.c
b/lib/strncpy_from_user.c
index
9c5fe81
..
7e35fc4
100644
(file)
--- a/
lib/strncpy_from_user.c
+++ b/
lib/strncpy_from_user.c
@@
-1,6
+1,7
@@
#include <linux/compiler.h>
#include <linux/export.h>
#include <linux/kasan-checks.h>
#include <linux/compiler.h>
#include <linux/export.h>
#include <linux/kasan-checks.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>
@@
-111,6
+112,7
@@
long strncpy_from_user(char *dst, const char __user *src, long count)
long retval;
kasan_check_write(dst, count);
long retval;
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();
user_access_begin();
retval = do_strncpy_from_user(dst, src, count, max);
user_access_end();