diff options
| author | Max Filippov | 2018-11-04 09:46:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-21 09:19:16 +0100 |
| commit | 591dd5df1758e19f19fc58d5600f8a02013051a5 (patch) | |
| tree | 0a0f6625dd028ab2988a42aa6315f8d7fc900fca | |
| parent | xtensa: add NOTES section to the linker script (diff) | |
| download | kernel-qcow2-linux-591dd5df1758e19f19fc58d5600f8a02013051a5.tar.gz kernel-qcow2-linux-591dd5df1758e19f19fc58d5600f8a02013051a5.tar.xz kernel-qcow2-linux-591dd5df1758e19f19fc58d5600f8a02013051a5.zip | |
xtensa: make sure bFLT stack is 16 byte aligned
commit 0773495b1f5f1c5e23551843f87b5ff37e7af8f7 upstream.
Xtensa ABI requires stack alignment to be at least 16. In noMMU
configuration ARCH_SLAB_MINALIGN is used to align stack. Make it at
least 16.
This fixes the following runtime error in noMMU configuration, caused by
interaction between insufficiently aligned stack and alloca function,
that results in corruption of on-stack variable in the libc function
glob:
Caught unhandled exception in 'sh' (pid = 47, pc = 0x02d05d65)
- should not happen
EXCCAUSE is 15
Cc: stable@vger.kernel.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/xtensa/include/asm/processor.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h index e4ccb88b7996..677bc76c1d70 100644 --- a/arch/xtensa/include/asm/processor.h +++ b/arch/xtensa/include/asm/processor.h @@ -23,7 +23,11 @@ # error Linux requires the Xtensa Windowed Registers Option. #endif -#define ARCH_SLAB_MINALIGN XCHAL_DATA_WIDTH +/* Xtensa ABI requires stack alignment to be at least 16 */ + +#define STACK_ALIGN (XCHAL_DATA_WIDTH > 16 ? XCHAL_DATA_WIDTH : 16) + +#define ARCH_SLAB_MINALIGN STACK_ALIGN /* * User space process size: 1 GB. |