| From: Alexander Potapenko <glider@google.com> |
| Subject: kmsan: disable strscpy() optimization under KMSAN |
| Date: Thu, 15 Sep 2022 17:03:59 +0200 |
| |
| Disable the efficient 8-byte reading under KMSAN to avoid false positives. |
| |
| Link: https://lkml.kernel.org/r/20220915150417.722975-26-glider@google.com |
| Signed-off-by: Alexander Potapenko <glider@google.com> |
| Cc: Alexander Viro <viro@zeniv.linux.org.uk> |
| Cc: Alexei Starovoitov <ast@kernel.org> |
| Cc: Andrey Konovalov <andreyknvl@gmail.com> |
| Cc: Andrey Konovalov <andreyknvl@google.com> |
| Cc: Andy Lutomirski <luto@kernel.org> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Cc: Borislav Petkov <bp@alien8.de> |
| Cc: Christoph Hellwig <hch@lst.de> |
| Cc: Christoph Lameter <cl@linux.com> |
| Cc: David Rientjes <rientjes@google.com> |
| Cc: Dmitry Vyukov <dvyukov@google.com> |
| Cc: Eric Biggers <ebiggers@google.com> |
| Cc: Eric Biggers <ebiggers@kernel.org> |
| Cc: Eric Dumazet <edumazet@google.com> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Herbert Xu <herbert@gondor.apana.org.au> |
| Cc: Ilya Leoshkevich <iii@linux.ibm.com> |
| Cc: Ingo Molnar <mingo@redhat.com> |
| Cc: Jens Axboe <axboe@kernel.dk> |
| Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> |
| Cc: Kees Cook <keescook@chromium.org> |
| Cc: Marco Elver <elver@google.com> |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| Cc: Matthew Wilcox <willy@infradead.org> |
| Cc: Michael S. Tsirkin <mst@redhat.com> |
| Cc: Pekka Enberg <penberg@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Petr Mladek <pmladek@suse.com> |
| Cc: Stephen Rothwell <sfr@canb.auug.org.au> |
| Cc: Steven Rostedt <rostedt@goodmis.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Vasily Gorbik <gor@linux.ibm.com> |
| Cc: Vegard Nossum <vegard.nossum@oracle.com> |
| Cc: Vlastimil Babka <vbabka@suse.cz> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| lib/string.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| --- a/lib/string.c~kmsan-disable-strscpy-optimization-under-kmsan |
| +++ a/lib/string.c |
| @@ -197,6 +197,14 @@ ssize_t strscpy(char *dest, const char * |
| max = 0; |
| #endif |
| |
| + /* |
| + * read_word_at_a_time() below may read uninitialized bytes after the |
| + * trailing zero and use them in comparisons. Disable this optimization |
| + * under KMSAN to prevent false positive reports. |
| + */ |
| + if (IS_ENABLED(CONFIG_KMSAN)) |
| + max = 0; |
| + |
| while (max >= sizeof(unsigned long)) { |
| unsigned long c, data; |
| |
| _ |