diff options
| author |   Helge Deller <deller@gmx.de> | 2021-09-02 23:24:42 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2021-09-03 09:47:02 +0200 |
| commit | c42813b71a06a2ff4a155aa87ac609feeab76cf3 (patch) | |
| tree | 540c6dd6c8a11ab9b7409c67c4cc575fd905f1ee | |
| parent | parisc: Drop __arch_swab16(), arch_swab24(), _arch_swab32() and __arch_swab64() functions (diff) | |
| download | linux-dev-c42813b71a06a2ff4a155aa87ac609feeab76cf3.tar.xz linux-dev-c42813b71a06a2ff4a155aa87ac609feeab76cf3.zip | |
parisc: Fix unaligned-access crash in bootloader
Kernel v5.14 has various changes to optimize unaligned memory accesses,
e.g. commit 0652035a5794 ("asm-generic: unaligned: remove byteshift helpers").
Those changes triggered an unalignment-exception and thus crashed the
bootloader on parisc because the unaligned "output_len" variable now suddenly
was read word-wise while it was read byte-wise in the past.
Fix this issue by declaring the external output_len variable as char which then
forces the compiler to generate byte-accesses.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: Arnd Bergmann <arnd@kernel.org>
Cc: John David Anglin <dave.anglin@bell.net>
Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102162
Fixes: 8c031ba63f8f ("parisc: Unbreak bootloader due to gcc-7 optimizations")
Fixes: 0652035a5794 ("asm-generic: unaligned: remove byteshift helpers")
Cc: <stable@vger.kernel.org> # v5.14+
| -rw-r--r-- | arch/parisc/boot/compressed/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/boot/compressed/misc.c b/arch/parisc/boot/compressed/misc.c index 2d395998f524..7ee49f5881d1 100644 --- a/arch/parisc/boot/compressed/misc.c +++ b/arch/parisc/boot/compressed/misc.c @@ -26,7 +26,7 @@ extern char input_data[]; extern int input_len; /* output_len is inserted by the linker possibly at an unaligned address */ -extern __le32 output_len __aligned(1); +extern char output_len; extern char _text, _end; extern char _bss, _ebss; extern char _startcode_end; |