bc6d3d8353
GZIP-compressed files end with 4 byte data that represents the size
of the original input. The decompressors (the self-extracting kernel)
exploit it to know the vmlinux size beforehand. To mimic the GZIP's
trailer, Kbuild provides cmd_{bzip2,lzma,lzo,lz4,xzkern,zstd22}.
Unfortunately these macros are used everywhere despite the appended
size data is only useful for the decompressors.
There is no guarantee that such hand-crafted trailers are safely ignored.
In fact, the kernel refuses compressed initramdfs with the garbage data.
That is why usr/Makefile overrides size_append to make it no-op.
To limit the use of such broken compressed files, this commit renames
the existing macros as follows:
cmd_bzip2 --> cmd_bzip2_with_size
cmd_lzma --> cmd_lzma_with_size
cmd_lzo --> cmd_lzo_with_size
cmd_lz4 --> cmd_lz4_with_size
cmd_xzkern --> cmd_xzkern_with_size
cmd_zstd22 --> cmd_zstd22_with_size
To keep the decompressors working, I updated the following Makefiles
accordingly:
arch/arm/boot/compressed/Makefile
arch/h8300/boot/compressed/Makefile
arch/mips/boot/compressed/Makefile
arch/parisc/boot/compressed/Makefile
arch/s390/boot/compressed/Makefile
arch/sh/boot/compressed/Makefile
arch/x86/boot/compressed/Makefile
I reused the current macro names for the normal usecases; they produce
the compressed data in the proper format.
I did not touch the following:
arch/arc/boot/Makefile
arch/arm64/boot/Makefile
arch/csky/boot/Makefile
arch/mips/boot/Makefile
arch/riscv/boot/Makefile
arch/sh/boot/Makefile
kernel/Makefile
This means those Makefiles will stop appending the size data.
I dropped the 'override size_append' hack from usr/Makefile.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
Bug: 135791357
(cherry picked from commit 7ce7e984ab2b218d6e92d5165629022fe2daf9ee
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master)
Change-Id: I2efa0b2df75b31033e777618db6e12e38b0aa3f3
Signed-off-by: SzuWei Lin <szuweilin@google.com>
(cherry picked from commit 010f93525d)
89 lines
2.8 KiB
Makefile
89 lines
2.8 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
# linux/arch/parisc/boot/compressed/Makefile
|
|
#
|
|
# create a compressed self-extracting vmlinux image from the original vmlinux
|
|
#
|
|
|
|
KCOV_INSTRUMENT := n
|
|
GCOV_PROFILE := n
|
|
UBSAN_SANITIZE := n
|
|
|
|
targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2
|
|
targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4
|
|
targets += misc.o piggy.o sizes.h head.o real2.o firmware.o
|
|
targets += real2.S firmware.c
|
|
|
|
KBUILD_CFLAGS := -D__KERNEL__ -O2 -DBOOTLOADER
|
|
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
|
|
KBUILD_CFLAGS += -fno-strict-aliasing
|
|
KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -fno-builtin-printf
|
|
KBUILD_CFLAGS += -fno-PIE -mno-space-regs -mdisable-fpregs -Os
|
|
ifndef CONFIG_64BIT
|
|
KBUILD_CFLAGS += -mfast-indirect-calls
|
|
endif
|
|
|
|
OBJECTS += $(obj)/head.o $(obj)/real2.o $(obj)/firmware.o $(obj)/misc.o $(obj)/piggy.o
|
|
|
|
LDFLAGS_vmlinux := -X -e startup --as-needed -T
|
|
$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS) $(LIBGCC) FORCE
|
|
$(call if_changed,ld)
|
|
|
|
sed-sizes := -e 's/^\([0-9a-fA-F]*\) . \(__bss_start\|_end\|parisc_kernel_start\)$$/\#define SZ\2 0x\1/p'
|
|
|
|
quiet_cmd_sizes = GEN $@
|
|
cmd_sizes = $(NM) $< | sed -n $(sed-sizes) > $@
|
|
|
|
$(obj)/sizes.h: vmlinux FORCE
|
|
$(call if_changed,sizes)
|
|
|
|
AFLAGS_head.o += -I$(objtree)/$(obj) -DBOOTLOADER
|
|
$(obj)/head.o: $(obj)/sizes.h
|
|
|
|
CFLAGS_misc.o += -I$(objtree)/$(obj)
|
|
$(obj)/misc.o: $(obj)/sizes.h
|
|
|
|
$(obj)/firmware.o: $(obj)/firmware.c
|
|
$(obj)/firmware.c: $(srctree)/arch/$(SRCARCH)/kernel/firmware.c
|
|
$(call cmd,shipped)
|
|
|
|
AFLAGS_real2.o += -DBOOTLOADER
|
|
$(obj)/real2.o: $(obj)/real2.S
|
|
$(obj)/real2.S: $(srctree)/arch/$(SRCARCH)/kernel/real2.S
|
|
$(call cmd,shipped)
|
|
|
|
$(obj)/misc.o: $(obj)/sizes.h
|
|
|
|
CPPFLAGS_vmlinux.lds += -I$(objtree)/$(obj) -DBOOTLOADER
|
|
$(obj)/vmlinux.lds: $(obj)/sizes.h
|
|
|
|
OBJCOPYFLAGS_vmlinux.bin := -R .comment -R .note -S
|
|
$(obj)/vmlinux.bin: vmlinux FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
vmlinux.bin.all-y := $(obj)/vmlinux.bin
|
|
|
|
suffix-$(CONFIG_KERNEL_GZIP) := gz
|
|
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
|
|
suffix-$(CONFIG_KERNEL_LZ4) := lz4
|
|
suffix-$(CONFIG_KERNEL_LZMA) := lzma
|
|
suffix-$(CONFIG_KERNEL_LZO) := lzo
|
|
suffix-$(CONFIG_KERNEL_XZ) := xz
|
|
|
|
$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE
|
|
$(call if_changed,gzip)
|
|
$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE
|
|
$(call if_changed,bzip2_with_size)
|
|
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
|
|
$(call if_changed,lz4_with_size)
|
|
$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE
|
|
$(call if_changed,lzma_with_size)
|
|
$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
|
|
$(call if_changed,lzo_with_size)
|
|
$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE
|
|
$(call if_changed,xzkern_with_size)
|
|
|
|
LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T
|
|
$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE
|
|
$(call if_changed,ld)
|