]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
initrd: Replace simple_strtol with kstrtoint to improve ramdisk_start_setup
authorThorsten Blum <thorsten.blum@linux.dev>
Thu, 18 Sep 2025 16:24:47 +0000 (18:24 +0200)
committerChristian Brauner <brauner@kernel.org>
Fri, 31 Oct 2025 09:12:32 +0000 (10:12 +0100)
Replace simple_strtol() with the recommended kstrtoint() for parsing the
'ramdisk_start=' boot parameter. Unlike simple_strtol(), which returns a
a long, kstrtoint() converts the string directly to an integer and
avoids implicit casting.

Check the return value of kstrtoint() and reject invalid values. This
adds error handling while preserving existing behavior for valid values,
and removes use of the deprecated simple_strtol() helper.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
init/do_mounts_rd.c

index 19d9f33dcacf85df4fe0462a3f69bfbf4335c793..eddbe5cb0413a79a9059d1d64cac94da7c1da833 100644 (file)
@@ -29,8 +29,7 @@ int __initdata rd_image_start;                /* starting block # of image */
 
 static int __init ramdisk_start_setup(char *str)
 {
-       rd_image_start = simple_strtol(str,NULL,0);
-       return 1;
+       return kstrtoint(str, 0, &rd_image_start) == 0;
 }
 __setup("ramdisk_start=", ramdisk_start_setup);