2022-12-08 12:14:06

by Yang Yang

[permalink] [raw]
Subject: [PATCH linux-next] net: hns3: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL terminated strings.

Signed-off-by: Xu Panda <[email protected]>
Signed-off-by: Yang Yang <[email protected]>
---
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index cdf76fb58d45..55306fe8a540 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -639,13 +639,11 @@ static void hns3_get_drvinfo(struct net_device *netdev,
return;
}

- strncpy(drvinfo->driver, dev_driver_string(&h->pdev->dev),
+ strscpy(drvinfo->driver, dev_driver_string(&h->pdev->dev),
sizeof(drvinfo->driver));
- drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0';

- strncpy(drvinfo->bus_info, pci_name(h->pdev),
+ strscpy(drvinfo->bus_info, pci_name(h->pdev),
sizeof(drvinfo->bus_info));
- drvinfo->bus_info[ETHTOOL_BUSINFO_LEN - 1] = '\0';

fw_version = priv->ae_handle->ae_algo->ops->get_fw_version(h);

--
2.15.2


2022-12-08 16:30:55

by Simon Horman

[permalink] [raw]
Subject: Re: [PATCH linux-next] net: hns3: use strscpy() to instead of strncpy()

On Thu, Dec 08, 2022 at 07:53:25PM +0800, [email protected] wrote:
> From: Xu Panda <[email protected]>
>
> The implementation of strscpy() is more robust and safer.
> That's now the recommended way to copy NUL terminated strings.
>
> Signed-off-by: Xu Panda <[email protected]>
> Signed-off-by: Yang Yang <[email protected]>

This change looks good to me, although it should probably be
tagged for 'net-next' rather than 'linux-next'.

[PATCH net-next] net: hns3: use strscpy() to instead of strncpy

That notwithstanding,

Reviewed-by: Simon Horman <[email protected]>