Skip to contentSkip to conversation

net: hns3: use strscpy() to instead of strncpy()

PATCH In review [email protected] 2 participants 2 messages Dec 8, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +2 -4
index cdf76fb58d45..55306fe8a540 100644
@@ -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);
 
Signature · 1 line
2.15.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · 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.

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,