generic: 6.1: manually refresh hack patches

[openwrt/openwrt.git] / target / linux / generic / hack-6.1 / 920-device_tree_cmdline.patch

diff --git a/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch b/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
index d1f36e716ed9bac812a61f535b40e9c920cfd648..2722266722eb9ab8ecaac6578c644915ba00729d 100644 (file)
--- a/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
+++ b/target/linux/generic/hack-6.1/920-device_tree_cmdline.patch
@@ -12,10 +12,10 @@ Subject: [PATCH] of/ftd: add device tree cmdline
 @@ -1158,6 +1158,9 @@ int __init early_init_dt_scan_chosen(uns
        p = of_get_flat_dt_prop(node, "bootargs", &l);
        if (p != NULL && l > 0)
-               strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
+               strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE));
 +      p = of_get_flat_dt_prop(node, "bootargs-append", &l);
 +      if (p != NULL && l > 0)
-+              strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
++              strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));
  
        /*
         * CONFIG_CMDLINE is meant to be a default in case nothing else