staging: qlge/qlge_ethtool.c: Switch from strlcpy to strscpy
authorKumar Kartikeya Dwivedi <memxor@gmail.com>
Sat, 30 Jan 2021 04:48:28 +0000 (10:18 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 31 Jan 2021 12:39:16 +0000 (13:39 +0100)
strlcpy is marked as deprecated in Documentation/process/deprecated.rst,
and there is no functional difference when the caller expects truncation
(when not checking the return value). strscpy is relatively better as it
also avoids scanning the whole source string.

This silences the related checkpatch warnings from:
5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20210130044828.121248-1-memxor@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/qlge/qlge_ethtool.c

index a296a51078bc62ec60ef8781318ff783e8cb14a4..b70570b7b4677e0a49f2b03a250db723da78eeba 100644 (file)
@@ -415,15 +415,15 @@ static void qlge_get_drvinfo(struct net_device *ndev,
 {
        struct qlge_adapter *qdev = netdev_to_qdev(ndev);
 
-       strlcpy(drvinfo->driver, qlge_driver_name, sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, qlge_driver_version,
+       strscpy(drvinfo->driver, qlge_driver_name, sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, qlge_driver_version,
                sizeof(drvinfo->version));
        snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
                 "v%d.%d.%d",
                 (qdev->fw_rev_id & 0x00ff0000) >> 16,
                 (qdev->fw_rev_id & 0x0000ff00) >> 8,
                 (qdev->fw_rev_id & 0x000000ff));
-       strlcpy(drvinfo->bus_info, pci_name(qdev->pdev),
+       strscpy(drvinfo->bus_info, pci_name(qdev->pdev),
                sizeof(drvinfo->bus_info));
 }