| Message ID | 20221030183647.3371915-1-git@johnthomson.fastmail.com.au (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 62776e4378ae9086115ffd6f8bd9b9c0fe6e6809 |
| Headers | show |
| Series | mips: boot/compressed: use __NO_FORITFY | expand |
On Mon, Oct 31, 2022 at 04:36:47AM +1000, John Thomson wrote: > In the mips CONFIG_SYS_SUPPORTS_ZBOOT kernel, fix the compile error > when using CONFIG_FORTIFY_SOURCE=y > > LD vmlinuz > mipsel-openwrt-linux-musl-ld: arch/mips/boot/compressed/decompress.o: in > function `decompress_kernel': > ./include/linux/decompress/mm.h:(.text.decompress_kernel+0x177c): > undefined reference to `warn_slowpath_fmt' > > kernel test robot helped identify this as related to fortify. The error > appeared with commit 54d9469bc515 ("fortify: Add run-time WARN for > cross-field memcpy()") > Link: https://lore.kernel.org/r/202209161144.x9xSqNQZ-lkp@intel.com/ > > Resolve this in the same style as commit cfecea6ead5f ("lib/string: > Move helper functions out of string.c") > > Reported-by: kernel test robot <lkp@intel.com> > Fixes: 54d9469bc515 ("fortify: Add run-time WARN for cross-field memcpy()") > Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au> > --- > not sure about the fixes tag: > compile error only occurs due to the fortify commit, but it looks like > this change could have been part of the other commit identified in the > message: lib/string move helper functions? I think the Fixes tag is reasonable. Strictly speaking, it should likely be whatever added the memcpy() in decompress.c, but that's mostly nonsense, since nothing else had tripped yet. :) The issue is that the memcpy() has a runtime length, so CONFIG_FORTIFY_SOURCE was inserting the logic for a runtime warning, which doesn't exist here. This is the correct fix (turning off FORTIFY in the early boot loader). Reviewed-by: Kees Cook <keescook@chromium.org>
On 30/10/22 19:36, John Thomson wrote: > In the mips CONFIG_SYS_SUPPORTS_ZBOOT kernel, fix the compile error > when using CONFIG_FORTIFY_SOURCE=y > > LD vmlinuz > mipsel-openwrt-linux-musl-ld: arch/mips/boot/compressed/decompress.o: in > function `decompress_kernel': > ./include/linux/decompress/mm.h:(.text.decompress_kernel+0x177c): > undefined reference to `warn_slowpath_fmt' > > kernel test robot helped identify this as related to fortify. The error > appeared with commit 54d9469bc515 ("fortify: Add run-time WARN for > cross-field memcpy()") > Link: https://lore.kernel.org/r/202209161144.x9xSqNQZ-lkp@intel.com/ > > Resolve this in the same style as commit cfecea6ead5f ("lib/string: > Move helper functions out of string.c") > > Reported-by: kernel test robot <lkp@intel.com> > Fixes: 54d9469bc515 ("fortify: Add run-time WARN for cross-field memcpy()") > Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au> > --- > not sure about the fixes tag: > compile error only occurs due to the fortify commit, but it looks like > this change could have been part of the other commit identified in the > message: lib/string move helper functions? > --- > arch/mips/boot/compressed/decompress.c | 1 + > 1 file changed, 1 insertion(+) Typo "__NO_FORTIFY" in subject.
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index 5b38a802e101..c5dd415254d3 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c @@ -9,6 +9,7 @@ #define DISABLE_BRANCH_PROFILING +#define __NO_FORTIFY #include <linux/types.h> #include <linux/kernel.h> #include <linux/string.h>
In the mips CONFIG_SYS_SUPPORTS_ZBOOT kernel, fix the compile error when using CONFIG_FORTIFY_SOURCE=y LD vmlinuz mipsel-openwrt-linux-musl-ld: arch/mips/boot/compressed/decompress.o: in function `decompress_kernel': ./include/linux/decompress/mm.h:(.text.decompress_kernel+0x177c): undefined reference to `warn_slowpath_fmt' kernel test robot helped identify this as related to fortify. The error appeared with commit 54d9469bc515 ("fortify: Add run-time WARN for cross-field memcpy()") Link: https://lore.kernel.org/r/202209161144.x9xSqNQZ-lkp@intel.com/ Resolve this in the same style as commit cfecea6ead5f ("lib/string: Move helper functions out of string.c") Reported-by: kernel test robot <lkp@intel.com> Fixes: 54d9469bc515 ("fortify: Add run-time WARN for cross-field memcpy()") Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au> --- not sure about the fixes tag: compile error only occurs due to the fortify commit, but it looks like this change could have been part of the other commit identified in the message: lib/string move helper functions? --- arch/mips/boot/compressed/decompress.c | 1 + 1 file changed, 1 insertion(+)