]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
lkdtm: hide stack overflow warning for corrupt-stack test
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Jan 2017 14:56:44 +0000 (15:56 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jan 2017 11:42:25 +0000 (12:42 +0100)
After the latest change to make sure the compiler actually does a memset,
it is now smart enough to flag the stack overflow at compile time,
at least with gcc-7.0:

drivers/misc/lkdtm_bugs.c: In function 'lkdtm_CORRUPT_STACK':
drivers/misc/lkdtm_bugs.c:88:144: warning: 'memset' writing 64 bytes into a region of size 8 overflows the destination [-Wstringop-overflow=]

To outsmart the compiler again, this moves the memset into a noinline
function where (for now) it doesn't see that we intentionally write
broken code here.

Fixes: c55d240003ae ("lkdtm: Prevent the compiler from optimising lkdtm_CORRUPT_STACK()")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/lkdtm_bugs.c

index 91edd0b55e5ce99e955708d7c5425515fd7740bd..bb3bb8ef5f4401d13e5e6b35e8797cb48dc8f081 100644 (file)
@@ -80,12 +80,17 @@ void lkdtm_OVERFLOW(void)
        (void) recursive_loop(recur_count);
 }
 
+static noinline void __lkdtm_CORRUPT_STACK(void *stack)
+{
+       memset(stack, 'a', 64);
+}
+
 noinline void lkdtm_CORRUPT_STACK(void)
 {
        /* Use default char array length that triggers stack protection. */
        char data[8];
+       __lkdtm_CORRUPT_STACK(&data);
 
-       memset((void *)data, 'a', 64);
        pr_info("Corrupted stack with '%16s'...\n", data);
 }