diff mbox series

[06/13] staging: octeon: Switch from strlcpy to strscpy

Message ID 20210131172838.146706-7-memxor@gmail.com
State New
Headers show
Series None | expand

Commit Message

Kumar Kartikeya Dwivedi Jan. 31, 2021, 5:28 p.m. UTC
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>
---
 drivers/staging/octeon/ethernet-mdio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Robert Richter Feb. 16, 2021, 2:36 p.m. UTC | #1
On 31.01.21 22:58:27, Kumar Kartikeya Dwivedi 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:

> 5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")

> 

> Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>

> ---

>  drivers/staging/octeon/ethernet-mdio.c | 6 +++---

>  1 file changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Robert Richter <rric@kernel.org>
diff mbox series

Patch

diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index 0bf545849..1bb91a904 100644
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -21,9 +21,9 @@ 
 static void cvm_oct_get_drvinfo(struct net_device *dev,
 				struct ethtool_drvinfo *info)
 {
-	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
-	strlcpy(info->version, UTS_RELEASE, sizeof(info->version));
-	strlcpy(info->bus_info, "Builtin", sizeof(info->bus_info));
+	strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+	strscpy(info->version, UTS_RELEASE, sizeof(info->version));
+	strscpy(info->bus_info, "Builtin", sizeof(info->bus_info));
 }
 
 static int cvm_oct_nway_reset(struct net_device *dev)