diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-08-29 16:11:10 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-08-29 16:11:10 +0100 |
| commit | 3168a743461ecf86adf3e7dcfcd79271828fb263 (patch) | |
| tree | 023ea03c1e59f6ec198a1b2608fe8a920563956b /arch/arm64 | |
| parent | 2520d039728b2a3c5ae7f79fe2a0e9d182855b12 (diff) | |
| download | op-kernel-dev-3168a743461ecf86adf3e7dcfcd79271828fb263.zip op-kernel-dev-3168a743461ecf86adf3e7dcfcd79271828fb263.tar.gz | |
arm64: report correct stack pointer in KSTK_ESP for compat tasks
The KSTK_ESP macro is used to determine the user stack pointer for a
given task. In particular, this is used to to report the '[stack]' VMA
in /proc/self/maps, which is used by Android to determine the stack
location for children of the main thread.
This patch fixes the macro to use user_stack_pointer instead of directly
returning sp. This means that we report w13 instead of sp, since the
former is used as the stack pointer when executing in AArch32 state.
Cc: <stable@vger.kernel.org>
Reported-by: Serban Constantinescu <Serban.Constantinescu@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 3df21fe..286b1be 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -139,7 +139,7 @@ extern struct task_struct *cpu_switch_to(struct task_struct *prev, ((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1) #define KSTK_EIP(tsk) ((unsigned long)task_pt_regs(tsk)->pc) -#define KSTK_ESP(tsk) ((unsigned long)task_pt_regs(tsk)->sp) +#define KSTK_ESP(tsk) user_stack_pointer(task_pt_regs(tsk)) /* * Prefetching support |
