diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2019-04-04 11:08:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-17 08:36:47 +0200 |
| commit | aea59964f5bb0092e15ee2a86bc2b0c1551a2589 (patch) | |
| tree | 953dd73bf804e40233e11629dcf5cf7b4afbc577 /arch/xtensa | |
| parent | 6d1e1da10c3a77e0f3f33c6f6649f75be9b3db5d (diff) | |
| download | linux-stable-aea59964f5bb0092e15ee2a86bc2b0c1551a2589.tar.gz linux-stable-aea59964f5bb0092e15ee2a86bc2b0c1551a2589.tar.bz2 linux-stable-aea59964f5bb0092e15ee2a86bc2b0c1551a2589.zip | |
xtensa: fix return_address
commit ada770b1e74a77fff2d5f539bf6c42c25f4784db upstream.
return_address returns the address that is one level higher in the call
stack than requested in its argument, because level 0 corresponds to its
caller's return address. Use requested level as the number of stack
frames to skip.
This fixes the address reported by might_sleep and friends.
Cc: stable@vger.kernel.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/stacktrace.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/stacktrace.c b/arch/xtensa/kernel/stacktrace.c index 7538d802b65a..483593068139 100644 --- a/arch/xtensa/kernel/stacktrace.c +++ b/arch/xtensa/kernel/stacktrace.c @@ -272,10 +272,14 @@ static int return_address_cb(struct stackframe *frame, void *data) return 1; } +/* + * level == 0 is for the return address from the caller of this function, + * not from this function itself. + */ unsigned long return_address(unsigned level) { struct return_addr_data r = { - .skip = level + 1, + .skip = level, }; walk_stackframe(stack_pointer(NULL), return_address_cb, &r); return r.addr; |