On Tue, Oct 10, 2023 at 07:53:32PM +0000, Justin Stitt wrote: > `strncpy` is deprecated for use on NUL-terminated destination strings > [1] and as such we should prefer more robust and less ambiguous string > interfaces. > > A suitable replacement is `strscpy` [2] due to the fact that it > guarantees NUL-termination on the destination buffer without > unnecessarily NUL-padding. > > Other implementations of .*get_drvinfo also use strscpy so this patch > brings fm10k_get_drvinfo in line as well: > > igb/igb_ethtool.c +851 > static void igb_get_drvinfo(struct net_device *netdev, > > igbvf/ethtool.c > 167:static void igbvf_get_drvinfo(struct net_device *netdev, > > i40e/i40e_ethtool.c > 1999:static void i40e_get_drvinfo(struct net_device *netdev, > > e1000/e1000_ethtool.c > 529:static void e1000_get_drvinfo(struct net_device *netdev, > > ixgbevf/ethtool.c > 211:static void ixgbevf_get_drvinfo(struct net_device *netdev, > > Link: > https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings > [1] > Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html > [2] > Link: https://github.com/KSPP/linux/issues/90 > Cc: linux-harden...@vger.kernel.org > Signed-off-by: Justin Stitt <justinst...@google.com> > --- > Note: build-tested only. > --- > drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > index d53369e30040..13a05604dcc0 100644 > --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c > @@ -448,10 +448,10 @@ static void fm10k_get_drvinfo(struct net_device *dev, > { > struct fm10k_intfc *interface = netdev_priv(dev); > > - strncpy(info->driver, fm10k_driver_name, > - sizeof(info->driver) - 1); > - strncpy(info->bus_info, pci_name(interface->pdev), > - sizeof(info->bus_info) - 1); > + strscpy(info->driver, fm10k_driver_name, > + sizeof(info->driver)); > + strscpy(info->bus_info, pci_name(interface->pdev), > + sizeof(info->bus_info)); > } > > static void fm10k_get_pauseparam(struct net_device *dev, > > --- > base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2 > change-id: > 20231010-strncpy-drivers-net-ethernet-intel-fm10k-fm10k_ethtool-c-8184ea77861f > > Best regards, > -- > Justin Stitt <justinst...@google.com> > Hi, this patch was bundled up with some others. It has a new home:
https://lore.kernel.org/all/20231010-netdev-replace-strncpy-resend-as-series-v1-0-caf9f0f2f...@google.com/ _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
