From: Rosen Penev Date: Sat, 20 Jun 2026 23:52:51 +0000 (-0700) Subject: kernel: handle bootargs-override the same everywhere X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8282f563dbfde98acc40b41aa210ab15841b2e8;p=thirdparty%2Fopenwrt.git kernel: handle bootargs-override the same everywhere l is an int. No need for a cast. Also might as well use l since it's available. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/23892 Signed-off-by: Jonas Jelonek --- diff --git a/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch index cd5c8c016da..d9e964d0182 100644 --- a/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch +++ b/target/linux/ipq806x/patches-6.12/900-arm-add-cmdline-override.patch @@ -29,7 +29,7 @@ +#ifdef CONFIG_CMDLINE_OVERRIDE + p = of_get_flat_dt_prop(node, "bootargs-override", &l); + if (p != NULL && l > 0) -+ strscpy(cmdline, p, min((int)l, COMMAND_LINE_SIZE)); ++ strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); +#endif + handle_cmdline: diff --git a/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch b/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch index 505ba385dff..d1a4376bed0 100644 --- a/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch +++ b/target/linux/mediatek/patches-6.18/901-arm-add-cmdline-override.patch @@ -43,7 +43,7 @@ Signed-off-by: Yoonji Park +#ifdef CONFIG_CMDLINE_OVERRIDE + p = of_get_flat_dt_prop(node, "bootargs-override", &l); + if (p != NULL && l > 0) -+ strscpy(cmdline, p, min((int)l, COMMAND_LINE_SIZE)); ++ strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); +#endif + handle_cmdline: diff --git a/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch index e7fb4bcd1b6..2e526d6a30b 100644 --- a/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-6.12/102-powerpc-add-cmdline-override.patch @@ -29,7 +29,7 @@ +#ifdef CONFIG_CMDLINE_OVERRIDE + p = of_get_flat_dt_prop(node, "bootargs-override", &l); + if (p != NULL && l > 0) -+ strscpy(cmdline, p, COMMAND_LINE_SIZE); ++ strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); +#endif + handle_cmdline: diff --git a/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch index 2fe98ff9ad3..6479766765b 100644 --- a/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch @@ -29,7 +29,7 @@ +#ifdef CONFIG_CMDLINE_OVERRIDE + p = of_get_flat_dt_prop(node, "bootargs-override", &l); + if (p != NULL && l > 0) -+ strscpy(cmdline, p, COMMAND_LINE_SIZE); ++ strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); +#endif + handle_cmdline: