lkml.org 
[lkml]   [2013]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 028/116] lkdtm: isolate stack corruption test
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kees Cook <keescook@chromium.org>

    commit 629c66a22c21b692b6e58b9c1d8fa56a60ccb52d upstream.

    When tests were added to lkdtm that grew the stack frame, the stack
    corruption test stopped working. This isolates the test in its own
    function, and forces it not to be inlined.

    Signed-off-by: Kees Cook <keescook@chromium.org>
    Fixes: cc33c537c12f ("lkdtm: add "EXEC_*" triggers")
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/misc/lkdtm.c | 16 ++++++++++------
    1 file changed, 10 insertions(+), 6 deletions(-)

    --- a/drivers/misc/lkdtm.c
    +++ b/drivers/misc/lkdtm.c
    @@ -297,6 +297,14 @@ static void do_nothing(void)
    return;
    }

    +static noinline void corrupt_stack(void)
    +{
    + /* Use default char array length that triggers stack protection. */
    + char data[8];
    +
    + memset((void *)data, 0, 64);
    +}
    +
    static void execute_location(void *dst)
    {
    void (*func)(void) = dst;
    @@ -327,13 +335,9 @@ static void lkdtm_do_action(enum ctype w
    case CT_OVERFLOW:
    (void) recursive_loop(0);
    break;
    - case CT_CORRUPT_STACK: {
    - /* Make sure the compiler creates and uses an 8 char array. */
    - volatile char data[8];
    -
    - memset((void *)data, 0, 64);
    + case CT_CORRUPT_STACK:
    + corrupt_stack();
    break;
    - }
    case CT_UNALIGNED_LOAD_STORE_WRITE: {
    static u8 data[5] __attribute__((aligned(4))) = {1, 2,
    3, 4, 5};



    \
     
     \ /
      Last update: 2013-11-27 03:41    [W:4.104 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site