2021-02-08 12:43:11

by Alexander Lobakin

Subject: [PATCH mips-fixes] MIPS: compressed: fix build with enabled UBSAN

Commit 1e35918ad9d1 ("MIPS: Enable Undefined Behavior Sanitizer
UBSAN") added a possibility to build the entire kernel with UBSAN
instrumentation for MIPS, with the exception for VDSO.
However, self-extracting head wasn't been added to exceptions, so
this occurs:

mips-alpine-linux-musl-ld: arch/mips/boot/compressed/decompress.o:
in function `FSE_buildDTable_wksp':
decompress.c:(.text.FSE_buildDTable_wksp+0x278): undefined reference
to `__ubsan_handle_shift_out_of_bounds'
mips-alpine-linux-musl-ld: decompress.c:(.text.FSE_buildDTable_wksp+0x2a8):
undefined reference to `__ubsan_handle_shift_out_of_bounds'
mips-alpine-linux-musl-ld: decompress.c:(.text.FSE_buildDTable_wksp+0x2c4):
undefined reference to `__ubsan_handle_shift_out_of_bounds'
mips-alpine-linux-musl-ld: arch/mips/boot/compressed/decompress.o:
decompress.c:(.text.FSE_buildDTable_raw+0x9c): more undefined references
to `__ubsan_handle_shift_out_of_bounds' follow

Add UBSAN_SANITIZE := n to mips/boot/compressed/Makefile to exclude
it from instrumentation scope and fix this issue.

Fixes: 1e35918ad9d1 ("MIPS: Enable Undefined Behavior Sanitizer UBSAN")
Cc: [email protected] # 5.0+
Signed-off-by: Alexander Lobakin <[email protected]>
---
arch/mips/boot/compressed/Makefile | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index 47cd9dc7454a..f93f72bcba97 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -37,6 +37,7 @@ KBUILD_AFLAGS := $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
KCOV_INSTRUMENT := n
GCOV_PROFILE := n
+UBSAN_SANITIZE := n

# decompressor objects (linked with vmlinuz)
vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o
--
2.30.0

2021-02-09 12:43:47

by Thomas Bogendoerfer

Subject: Re: [PATCH mips-fixes] MIPS: compressed: fix build with enabled UBSAN

On Mon, Feb 08, 2021 at 12:37:42PM +0000, Alexander Lobakin wrote:
> Commit 1e35918ad9d1 ("MIPS: Enable Undefined Behavior Sanitizer
> UBSAN") added a possibility to build the entire kernel with UBSAN
> instrumentation for MIPS, with the exception for VDSO.
> However, self-extracting head wasn't been added to exceptions, so
> this occurs:
>
> mips-alpine-linux-musl-ld: arch/mips/boot/compressed/decompress.o:
> in function `FSE_buildDTable_wksp':
> decompress.c:(.text.FSE_buildDTable_wksp+0x278): undefined reference
> to `__ubsan_handle_shift_out_of_bounds'
> mips-alpine-linux-musl-ld: decompress.c:(.text.FSE_buildDTable_wksp+0x2a8):
> undefined reference to `__ubsan_handle_shift_out_of_bounds'
> mips-alpine-linux-musl-ld: decompress.c:(.text.FSE_buildDTable_wksp+0x2c4):
> undefined reference to `__ubsan_handle_shift_out_of_bounds'
> mips-alpine-linux-musl-ld: arch/mips/boot/compressed/decompress.o:
> decompress.c:(.text.FSE_buildDTable_raw+0x9c): more undefined references
> to `__ubsan_handle_shift_out_of_bounds' follow
>
> Add UBSAN_SANITIZE := n to mips/boot/compressed/Makefile to exclude
> it from instrumentation scope and fix this issue.
>
> Fixes: 1e35918ad9d1 ("MIPS: Enable Undefined Behavior Sanitizer UBSAN")
> Cc: [email protected] # 5.0+
> Signed-off-by: Alexander Lobakin <[email protected]>
> ---
> arch/mips/boot/compressed/Makefile | 1 +
> 1 file changed, 1 insertion(+)

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]