diff options
| author | David Disseldorp <ddiss@suse.de> | 2025-03-04 16:57:51 +1100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-03-08 12:13:26 +0100 |
| commit | 7a329ed2dea95b14e3bd5e4ff0d22f2ce0ba4b86 (patch) | |
| tree | ae07400872acd12639677e70ae751cac224b9cfc /init | |
| parent | 225034cd510a014e673f5c131c77858fc2f372a1 (diff) | |
initramfs: avoid static buffer for error message
The dynamic error message printed if CONFIG_RD_$ALG compression support
is missing needn't be propagated up to the caller via a static buffer.
Print it immediately via pr_err() and set @message to a const string to
flag error.
Before:
text data bss dec hex filename
8006 1118 8 9132 23ac init/initramfs.o
After:
text data bss dec hex filename
7938 1022 8 8968 2308 init/initramfs.o
Signed-off-by: David Disseldorp <ddiss@suse.de>
Link: https://lore.kernel.org/r/20250304061020.9815-9-ddiss@suse.de
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/initramfs.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index e0b11f8d6f3d..72bad44a1d41 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -511,7 +511,6 @@ char * __init unpack_to_rootfs(char *buf, unsigned long len) long written; decompress_fn decompress; const char *compress_name; - static __initdata char msg_buf[64]; struct { char header[CPIO_HDRLEN]; char symlink[PATH_MAX + N_ALIGN(PATH_MAX) + 1]; @@ -552,12 +551,9 @@ char * __init unpack_to_rootfs(char *buf, unsigned long len) if (res) error("decompressor failed"); } else if (compress_name) { - if (!message) { - snprintf(msg_buf, sizeof msg_buf, - "compression method %s not configured", - compress_name); - message = msg_buf; - } + pr_err("compression method %s not configured\n", + compress_name); + error("decompressor failed"); } else error("invalid magic at start of compressed archive"); if (state != Reset) |