| Message ID | 20211229232257.3525-1-olek2@wp.pl (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7b1cd6a644f765e189904ffe2b612ec4183ebfaa |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: lantiq_etop: replace strlcpy with strscpy | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 30 Dec 2021 00:22:57 +0100 you wrote: > 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: > commit 5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy") > > [...] Here is the summary with links: - [net-next] net: lantiq_etop: replace strlcpy with strscpy https://git.kernel.org/netdev/net-next/c/7b1cd6a644f7 You are awesome, thank you!
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 072391c494ce..d8e100535999 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -305,9 +305,9 @@ ltq_etop_hw_init(struct net_device *dev) static void ltq_etop_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strlcpy(info->driver, "Lantiq ETOP", sizeof(info->driver)); - strlcpy(info->bus_info, "internal", sizeof(info->bus_info)); - strlcpy(info->version, DRV_VERSION, sizeof(info->version)); + strscpy(info->driver, "Lantiq ETOP", sizeof(info->driver)); + strscpy(info->bus_info, "internal", sizeof(info->bus_info)); + strscpy(info->version, DRV_VERSION, sizeof(info->version)); } static const struct ethtool_ops ltq_etop_ethtool_ops = {
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: commit 5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy") Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl> --- drivers/net/ethernet/lantiq_etop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)