On Sun, Feb 07, 2021 at 03:13:20PM +0000, Phillip Potter wrote:
> Convert three calls to strlcpy inside the cvm_oct_get_drvinfo function
> to strscpy calls. As return values were not checked for these three
> calls before, change should be safe as functionality is equivalent.
> 
> Signed-off-by: Phillip Potter <p...@philpotter.co.uk>
> ---
> 
> v2: Modified changelog to take account of feedback from Greg KH.
> 
>  drivers/staging/octeon/ethernet-mdio.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/octeon/ethernet-mdio.c 
> b/drivers/staging/octeon/ethernet-mdio.c
> index b0fd083a5bf2..b3049108edc4 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)

Sorry, this does not apply to my tree, someone already did this
conversion before you :(

greg k-h
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to