Re: [PATCH net-next v2] hns: use strscpy() to instead of strncpy()

From: Hao Lan
Date: Mon Dec 12 2022 - 20:27:29 EST




On 2022/12/9 15:33, yang.yang29@xxxxxxxxxx wrote:
> From: Xu Panda <xu.panda@xxxxxxxxxx>
>
> 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 <xu.panda@xxxxxxxxxx>
> Signed-off-by: Yang Yang <yang.yang29@xxxxxxx>
> ---
> change for v2
> - change the prefix and subject: replace ethtool with hns,
> and replace linux-next with net-next.
> ---
> drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> index 54faf0f2d1d8..b54f3706fb97 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
> @@ -644,18 +644,15 @@ static void hns_nic_get_drvinfo(struct net_device *net_dev,
> {
> struct hns_nic_priv *priv = netdev_priv(net_dev);
>
> - strncpy(drvinfo->version, HNAE_DRIVER_VERSION,
> + strscpy(drvinfo->version, HNAE_DRIVER_VERSION,
> sizeof(drvinfo->version));
> - drvinfo->version[sizeof(drvinfo->version) - 1] = '\0';
>
> - strncpy(drvinfo->driver, HNAE_DRIVER_NAME, sizeof(drvinfo->driver));
> - drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0';
> + strscpy(drvinfo->driver, HNAE_DRIVER_NAME, sizeof(drvinfo->driver));
>
> - strncpy(drvinfo->bus_info, priv->dev->bus->name,
> + strscpy(drvinfo->bus_info, priv->dev->bus->name,
> sizeof(drvinfo->bus_info));
> - drvinfo->bus_info[ETHTOOL_BUSINFO_LEN - 1] = '\0';
>
> - strncpy(drvinfo->fw_version, "N/A", ETHTOOL_FWVERS_LEN);
> + strscpy(drvinfo->fw_version, "N/A", ETHTOOL_FWVERS_LEN);
> drvinfo->eedump_len = 0;
> }
>
Reviewed-by: Hao Lan <lanhao@xxxxxxxxxx>