git.openwrt.org Git - openwrt/staging/wigyori.git/blob

   1 From 9b4f1f5a0801652056670a38503b4049eb413caf Mon Sep 17 00:00:00 2001
   2 From: Justin Stitt <justinstitt@google.com>
   3 Date: Mon, 9 Oct 2023 18:29:19 +0000
   4 Subject: [PATCH 03/30] net: dsa: mt7530: replace deprecated strncpy with
   5  ethtool_sprintf
   6
   7 `strncpy` is deprecated for use on NUL-terminated destination strings
   8 [1] and as such we should prefer more robust and less ambiguous string
   9 interfaces.
  10
  11 ethtool_sprintf() is designed specifically for get_strings() usage.
  12 Let's replace strncpy in favor of this more robust and easier to
  13 understand interface.
  14
  15 Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
  16 Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2]
  17 Link: https://github.com/KSPP/linux/issues/90
  18 Signed-off-by: Justin Stitt <justinstitt@google.com>
  19 Reviewed-by: Kees Cook <keescook@chromium.org>
  20 Acked-by: Daniel Golle <daniel@makrotopia.org>
  21 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
  22 Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
  23 Link: https://lore.kernel.org/r/20231009-strncpy-drivers-net-dsa-mt7530-c-v1-1-ec6677a6436a@google.com
  24 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  25 ---
  26  drivers/net/dsa/mt7530.c | 3 +--
  27  1 file changed, 1 insertion(+), 2 deletions(-)
  28
  29 --- a/drivers/net/dsa/mt7530.c
  30 +++ b/drivers/net/dsa/mt7530.c
  31 @@ -836,8 +836,7 @@ mt7530_get_strings(struct dsa_switch *ds
  32                 return;
  33
  34         for (i = 0; i < ARRAY_SIZE(mt7530_mib); i++)
  35 -               strncpy(data + i * ETH_GSTRING_LEN, mt7530_mib[i].name,
  36 -                       ETH_GSTRING_LEN);
  37 +               ethtool_sprintf(&data, "%s", mt7530_mib[i].name);
  38  }
  39
  40  static void