Dimitri John Ledkov
13b51d90f0
lib/decompress_unlz4.c: correctly handle zero-padding around initrds. ...
[ Upstream commit 2c484419efc09e7234c667aa72698cb79ba8d8ed ]
lz4 compatible decompressor is simple. The format is underspecified and
relies on EOF notification to determine when to stop. Initramfs buffer
format[1] explicitly states that it can have arbitrary number of zero
padding. Thus when operating without a fill function, be extra careful to
ensure that sizes less than 4, or apperantly empty chunksizes are treated
as EOF.
To test this I have created two cpio initrds, first a normal one,
main.cpio. And second one with just a single /test-file with content
"second" second.cpio. Then i compressed both of them with gzip, and with
lz4 -l. Then I created a padding of 4 bytes (dd if=/dev/zero of=pad4 bs=1
count=4). To create four testcase initrds:
1) main.cpio.gzip + extra.cpio.gzip = pad0.gzip
2) main.cpio.lz4 + extra.cpio.lz4 = pad0.lz4
3) main.cpio.gzip + pad4 + extra.cpio.gzip = pad4.gzip
4) main.cpio.lz4 + pad4 + extra.cpio.lz4 = pad4.lz4
The pad4 test-cases replicate the initrd load by grub, as it pads and
aligns every initrd it loads.
All of the above boot, however /test-file was not accessible in the initrd
for the testcase #4 , as decoding in lz4 decompressor failed. Also an
error message printed which usually is harmless.
Whith a patched kernel, all of the above testcases now pass, and
/test-file is accessible.
This fixes lz4 initrd decompress warning on every boot with grub. And
more importantly this fixes inability to load multiple lz4 compressed
initrds with grub. This patch has been shipping in Ubuntu kernels since
January 2021.
[1] ./Documentation/driver-api/early-userspace/buffer-format.rst
BugLink: https://bugs.launchpad.net/bugs/1835660
Link: https://lore.kernel.org/lkml/20210114200256.196589-1-xnox@ubuntu.com/ # v0
Link: https://lkml.kernel.org/r/20210513104831.432975-1-dimitri.ledkov@canonical.com
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Bongkyu Kim <bongkyu.kim@lge.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
Cc: Rajat Asthana <thisisrast7@gmail.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Gao Xiang <hsiangkao@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-07-20 16:10:46 +02:00
lib: 842: no need to check return value of debugfs_create functions
2019-07-03 16:57:17 +02:00
crypto: sha256 - Remove sha256/224_init code duplication
2019-09-05 14:54:54 +10:00
lib/dim: Fix -Wunused-const-variable warnings
2019-07-25 11:34:39 -07:00
Fonts: Replace discarded const qualifier
2020-11-10 12:37:26 +01:00
lib/lz4: explicitly support in-place decompression
2021-06-10 13:37:16 +02:00
lib/lzo: fix ambiguous encoding bug in lzo-rle
2020-06-17 16:40:28 +02:00
lib/mpi: Fix 64-bit MIPS build with Clang
2020-06-22 09:31:00 +02:00
lib/raid6: Let $(UNROLL) rules work with macOS userland
2021-01-19 18:26:15 +01:00
rslib: Make some functions static
2019-07-02 08:41:37 +02:00
lib/vdso: Make clock_getres() POSIX compliant again
2019-10-23 14:48:23 +02:00
lib/xz: fix XZ_DYNALLOC to avoid useless memory reallocations
2019-11-15 18:34:00 -08:00
lib/zlib: remove outdated and incorrect pre-increment optimization
2020-06-24 17:50:39 +02:00
lib/zstd/mem.h: replace __inline by inline
2019-09-15 19:42:16 +02:00
locking/atomic: Use s64 for atomic64
2019-06-03 12:32:56 +02:00
cpumask: Implement cpumask_or_equal()
2019-07-25 15:47:37 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 372
2019-06-05 17:37:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 431
2019-06-05 17:37:16 +02:00
bug: Remove redundant condition check in report_bug
2021-05-14 09:44:27 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
2019-06-19 17:09:06 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
2019-06-19 17:09:06 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
2019-06-19 17:09:06 +02:00
crc-t10dif: Fix potential crypto notify dead-lock
2020-08-19 08:15:54 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
2019-06-19 17:09:06 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
2019-06-19 17:09:06 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
2019-06-19 17:09:06 +02:00
lib/crc32.c: fix trivial typo in preprocessor condition
2020-10-29 09:57:52 +01:00
lib/crc32test: remove extra local_irq_disable/enable
2020-11-10 12:37:27 +01:00
debugobjects: Fix various data races
2020-02-24 08:36:52 +01:00
lib/decompress_unlz4.c: correctly handle zero-padding around initrds.
2021-07-20 16:10:46 +02:00
devres: keep both device name and resource name in pretty name
2020-08-21 13:05:32 +02:00
Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs"
2019-07-10 18:43:43 -07:00
dump_stack: avoid the livelock of the dump_lock
2019-11-06 08:47:50 -08:00
dyndbg: fix a BUG_ON in ddebug_describe_flags
2020-08-19 08:16:04 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 283
2019-06-05 17:36:37 +02:00
lib/extable.c: add missing prototypes
2019-09-25 17:51:39 -07:00
fault-inject: clean up debugfs file creation logic
2019-06-18 13:47:24 +02:00
uapi: rename ext2_swab() to swab() and share globally in swab.h
2020-04-13 10:48:07 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295
2019-06-05 17:36:38 +02:00
lib/genalloc: fix the overflow when size is too big
2021-01-12 20:16:10 +01:00
lib/generic-radix-tree.c: add kmemleak annotations
2019-10-14 15:04:00 -07:00
lib/hexdump: make print_hex_dump_bytes() a nop on !DEBUG builds
2019-09-25 17:51:39 -07:00
ida: Free allocated bitmap in error path
2020-10-29 09:57:47 +01:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 504
2019-06-19 17:09:56 +02:00
mm/ioremap: probe platform for p4d huge map support
2019-07-16 19:23:22 -07:00
iov_iter_fault_in_readable() should do nothing in xarray case
2021-07-14 16:53:01 +02:00
lib: Remove select of inexistant GENERIC_IO
2019-11-10 10:38:43 -08:00
kernel/sysctl-test: Add null pointer test for sysctl.c:proc_dointvec()
2020-10-01 13:17:10 +02:00
kasan: add memory corruption identification for software tag-based mode
2019-09-24 15:54:07 -07:00
Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()"
2019-08-30 18:47:15 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 248
2019-06-19 17:09:08 +02:00
kobject: Restore old behaviour of kobject_del(NULL)
2020-09-17 13:47:52 +02:00
kobject_uevent: remove warning in init_uevent_argv()
2021-05-19 10:08:33 +02:00
lib: vsprintf: Fix handling of number field widths in vsscanf
2021-07-14 16:53:16 +02:00
lib: vsprintf: Fix handling of number field widths in vsscanf
2021-07-14 16:53:16 +02:00
lib: list_sort.c: add a blank line to avoid kernel-doc warnings
2019-06-20 14:07:34 -06:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 333
2019-06-05 17:37:06 +02:00
lockref: Limit number of cmpxchg loop retries
2019-06-07 13:15:06 -07:00
PCI: Fix pci_register_io_range() memory leak
2021-03-17 17:03:44 +01:00
avoid __memcat_p link failure
2021-05-07 10:51:37 +02:00
net: fix nla_strcmp to handle more then one trailing null character
2021-05-19 10:08:27 +02:00
lib: notifier-error-inject: no need to check return value of debugfs_create functions
2019-07-03 16:57:18 +02:00
lib: objagg: Use struct_size() in kzalloc()
2019-06-05 19:03:39 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 230
2019-06-19 17:09:06 +02:00
Merge branch 'for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu
2019-07-14 16:17:18 -07:00
idr: Fix idr_alloc_u32 on 32-bit systems
2019-11-03 06:36:50 -05:00
random32: make prandom_u32() output unpredictable
2020-11-18 19:20:20 +01:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 428
2019-06-05 17:37:16 +02:00
lib/rbtree: avoid generating code twice for the cached versions
2019-07-16 19:23:22 -07:00
augmented rbtree: add new RB_DECLARE_CALLBACKS_MAX macro
2019-09-25 17:51:39 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
sbitmap: only queue kyber's wait callback if not already active
2020-01-12 12:21:44 +01:00
sgl_alloc_order: fix memory leak
2020-11-05 11:43:22 +01:00
seq_buf: Fix overflow in seq_buf_putmem_hex()
2021-07-19 08:53:16 +02:00
SCSI sg on 20190709
2019-07-11 15:17:41 -07:00
lib: scatterlist: Fix to support no mapped sg
2019-08-08 07:45:01 -06:00
mm: remove quicklist page table caches
2019-09-24 15:54:09 -07:00
sched/core: Provide a pointer to the valid CPU mask
2019-06-03 11:49:37 +02:00
media: lib/sort.c: implement sort() variant taking context argument
2019-08-19 13:14:53 -03:00
lib: stackdepot: turn depot_lock spinlock to raw_spinlock
2021-05-22 11:38:30 +02:00
lib/string.c: implement stpcpy
2020-10-01 13:18:23 +02:00
lib/string_helpers: fix some kerneldoc warnings
2019-07-16 19:23:22 -07:00
lib: Reduce user_access_begin() boundaries in strncpy_from_user() and strnlen_user()
2020-01-29 16:45:29 +01:00
lib: Reduce user_access_begin() boundaries in strncpy_from_user() and strnlen_user()
2020-01-29 16:45:29 +01:00
lib/syscall: fix syscall registers retrieval on 32-bit platforms
2020-12-11 13:23:32 +01:00
blackhole_dev: add a selftest
2019-07-01 19:34:46 -07:00
test_bpf: Fix a new clang warning about xor-ing two numbers
2019-08-20 17:07:29 +02:00
test_firmware: add support for request_firmware_into_buf
2019-09-04 13:31:28 +02:00
kasan: stop tests being eliminated as dead code with FORTIFY_SOURCE
2020-06-22 09:31:12 +02:00
test_kmod: avoid potential double free in trigger_config_run_type()
2020-08-21 13:05:37 +02:00
lib/test_meminit: add a kmem_cache_alloc_bulk() test
2019-10-14 15:04:01 -07:00
test_objagg: Fix potential memory leak in error handling
2020-06-30 15:37:04 -04:00
lib/test_overflow.c: avoid tainting the kernel and fix wrap size
2019-07-16 19:23:22 -07:00
vsprintf: don't obfuscate NULL and error pointers
2020-05-27 17:46:43 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500
2019-06-19 17:09:55 +02:00
lib/test_stackinit: Handle Clang auto-initialization pattern
2019-06-05 07:36:43 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282
2019-06-05 17:36:37 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282
2019-06-05 17:36:37 +02:00
lib/test_string.c: add some testcases for strchr and strnchr
2019-07-16 19:23:22 -07:00
usercopy: Avoid soft lockups in test_check_nonzero_user()
2019-10-16 14:56:21 +02:00
XArray: add xas_split
2021-06-10 13:37:14 +02:00
lib: textsearch: fix escapes in example code
2019-10-03 12:12:23 -04:00
lib/timerqueue: Rely on rbtree semantics for next timer
2019-07-24 17:38:01 +02:00
lib/ubsan: don't serialize UBSAN report
2020-01-09 10:20:07 +01:00
lib: introduce copy_struct_from_user() helper
2019-10-01 15:45:03 +02:00
lib: vsprintf: Fix handling of number field widths in vsscanf
2021-07-14 16:53:16 +02:00
XArray: add xas_split
2021-06-10 13:37:14 +02:00
13b51d90f0