Merge tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux...

[linux-2.6-microblaze.git] / arch / x86 / kernel / unwind_orc.c

diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c
index 794fdef..38185ae 100644 (file)
--- a/arch/x86/kernel/unwind_orc.c
+++ b/arch/x86/kernel/unwind_orc.c
@@ -339,11 +339,11 @@ static bool stack_access_ok(struct unwind_state *state, unsigned long _addr,
        struct stack_info *info = &state->stack_info;
        void *addr = (void *)_addr;
 
-       if (!on_stack(info, addr, len) &&
-           (get_stack_info(addr, state->task, info, &state->stack_mask)))
-               return false;
+       if (on_stack(info, addr, len))
+               return true;
 
-       return true;
+       return !get_stack_info(addr, state->task, info, &state->stack_mask) &&
+               on_stack(info, addr, len);
 }
 
 static bool deref_stack_reg(struct unwind_state *state, unsigned long addr,