summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@suse.de>2025-03-04 16:57:47 +1100
committerChristian Brauner <brauner@kernel.org>2025-03-08 12:13:26 +0100
commita8a3bc2e3277858a7457da15225b08ca65a99b0b (patch)
treed2296ff1952ba45f21ea7c83ec9b8a09beaf72a5 /init
parentfcc155008a20fa31b01569e105250490750f0687 (diff)
downloadlinux-a8a3bc2e3277858a7457da15225b08ca65a99b0b.tar.gz
linux-a8a3bc2e3277858a7457da15225b08ca65a99b0b.tar.bz2
linux-a8a3bc2e3277858a7457da15225b08ca65a99b0b.zip
initramfs: avoid memcpy for hex header fields
newc/crc cpio headers contain a bunch of 8-character hexadecimal fields which we convert via simple_strtoul(), following memcpy() into a zero-terminated stack buffer. The new simple_strntoul() helper allows us to pass in max_chars=8 to avoid zero-termination and memcpy(). Signed-off-by: David Disseldorp <ddiss@suse.de> Link: https://lore.kernel.org/r/20250304061020.9815-5-ddiss@suse.de Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'init')
-rw-r--r--init/initramfs.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index 002e83ae12ac..6dd3b02c15d7 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -189,14 +189,11 @@ static __initdata u32 hdr_csum;
static void __init parse_header(char *s)
{
unsigned long parsed[13];
- char buf[9];
int i;
- buf[8] = '\0';
- for (i = 0, s += 6; i < 13; i++, s += 8) {
- memcpy(buf, s, 8);
- parsed[i] = simple_strtoul(buf, NULL, 16);
- }
+ for (i = 0, s += 6; i < 13; i++, s += 8)
+ parsed[i] = simple_strntoul(s, NULL, 16, 8);
+
ino = parsed[0];
mode = parsed[1];
uid = parsed[2];