summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-01 12:20:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-01 12:20:53 -0800
commit8e44e6600caa7b96a5b71ae36c8829db753c2d70 (patch)
treeb6cc9e2f7f703e2869a3d1f4e18b4e47b3c2cb21 /lib
parent562f36ed28e6faa4245ea2ca1392d90ab98ebbe8 (diff)
parentbabcbbc7c4e2fa7fa76417ece7c57083bee971f1 (diff)
downloadlinux-stable-8e44e6600caa7b96a5b71ae36c8829db753c2d70.tar.gz
linux-stable-8e44e6600caa7b96a5b71ae36c8829db753c2d70.tar.bz2
linux-stable-8e44e6600caa7b96a5b71ae36c8829db753c2d70.zip
Merge branch 'KASAN-read_word_at_a_time'
Merge KASAN word-at-a-time fixups from Andrey Ryabinin. The word-at-a-time optimizations have caused headaches for KASAN, since the whole point is that we access byte streams in bigger chunks, and KASAN can be unhappy about the potential extra access at the end of the string. We used to have a horrible hack in dcache, and then people got complaints from the strscpy() case. This fixes it all up properly, by adding an explicit helper for the "access byte stream one word at a time" case. * emailed patches from Andrey Ryabinin <aryabinin@virtuozzo.com>: fs: dcache: Revert "manually unpoison dname after allocation to shut up kasan's reports" fs/dcache: Use read_word_at_a_time() in dentry_string_cmp() lib/strscpy: Shut up KASAN false-positives in strscpy() compiler.h: Add read_word_at_a_time() function. compiler.h, kasan: Avoid duplicating __read_once_size_nocheck()
Diffstat (limited to 'lib')
-rw-r--r--lib/string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/string.c b/lib/string.c
index 64a9e33f1daa..2c0900a5d51a 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -203,7 +203,7 @@ ssize_t strscpy(char *dest, const char *src, size_t count)
while (max >= sizeof(unsigned long)) {
unsigned long c, data;
- c = *(unsigned long *)(src+res);
+ c = read_word_at_a_time(src+res);
if (has_zero(c, &data, &constants)) {
data = prep_zero_mask(c, data, &constants);
data = create_zero_mask(data);