diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-09-13 10:31:40 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-13 10:31:40 +0200 |
| commit | eb8994172a45029f3f589fd6b2bd5d54e5b6e036 (patch) | |
| tree | e99afa7659fdd6577616e110662386575b721b2c /drivers/misc/lkdtm_usercopy.c | |
| parent | 313b9a9938bf4076425741121d5d766826793e5d (diff) | |
| parent | 694d0d0bb2030d2e36df73e2d23d5770511dbc8d (diff) | |
Merge tag 'v4.8-rc2' into devel
Linux 4.8-rc2
Diffstat (limited to 'drivers/misc/lkdtm_usercopy.c')
| -rw-r--r-- | drivers/misc/lkdtm_usercopy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/lkdtm_usercopy.c b/drivers/misc/lkdtm_usercopy.c index 5a3fd76eec27..5525a204db93 100644 --- a/drivers/misc/lkdtm_usercopy.c +++ b/drivers/misc/lkdtm_usercopy.c @@ -49,7 +49,7 @@ static noinline void do_usercopy_stack(bool to_user, bool bad_frame) /* This is a pointer to outside our current stack frame. */ if (bad_frame) { - bad_stack = do_usercopy_stack_callee((uintptr_t)bad_stack); + bad_stack = do_usercopy_stack_callee((uintptr_t)&bad_stack); } else { /* Put start address just inside stack. */ bad_stack = task_stack_page(current) + THREAD_SIZE; |