Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ada770b1 authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: fix return_address 



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: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 2663147d

arch/xtensa/kernel/stacktrace.c

+5 −1
Original line number Diff line number Diff line
@@ -253,10 +253,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;