Re: [PATCH net-next] sweep the floors and convert some .get_drvinfo routines to strlcpy

[Ben Hutchings <bhutchings@solarflare.com>]

On Mon, 2011-11-07 at 13:56 -0800, Rick Jones wrote:
> From: Rick Jones <rick.jones2@hp.com>
> 
> Per the mention made by Ben Hutchings that strlcpy is now the preferred
> string copy routine for a .get_drvinfo routine, do a bit of floor
> sweeping and convert some of the as-yet unconverted ethernet drivers to
> it.
[...]
> diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
> index 972f80e..5e91602 100644
> --- a/drivers/net/ethernet/3com/3c589_cs.c
> +++ b/drivers/net/ethernet/3com/3c589_cs.c
> @@ -468,9 +468,10 @@ static void tc589_reset(struct net_device *dev)
>  static void netdev_get_drvinfo(struct net_device *dev,
>  			       struct ethtool_drvinfo *info)
>  {
> -	strcpy(info->driver, DRV_NAME);
> -	strcpy(info->version, DRV_VERSION);
> -	sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr);
> +	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
> +	strlcpy(info->version, DRV_VERSION, sizeof(info->version));
> +	snprintf(info->bus_info, sizeof(info->bus_info) - 1,
> +		"PCMCIA 0x%lx", dev->base_addr);
[...]

snprintf(), like strlcpy(), will always write a null terminator in the
buffer it is given (unless the buffer size is 0).  Therefore it is
incorrect to subtract 1 from the actual buffer size.

Ben.

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.