linux-kernel - Re: [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <543B97FA.8050207@mev.co.uk>
Date:	Mon, 13 Oct 2014 10:14:34 +0100
From:	Ian Abbott <abbotti@....co.uk>
To:	Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>,
	H Hartley Sweeten <hsweeten@...ionengravers.com>
CC:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Chase Southwood <chase.southwood@...oo.com>,
	devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] staging: comedi: drivers: comedi_bond.c:  Changed from
 using strncat to strlcat

On 12/10/14 13:23, Rickard Strandqvist wrote:
> Changed from using strncat to strlcat to simplify the code
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se>
> ---
>   drivers/staging/comedi/drivers/comedi_bond.c |    6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
> index 8450c99..5d19861 100644
> --- a/drivers/staging/comedi/drivers/comedi_bond.c
> +++ b/drivers/staging/comedi/drivers/comedi_bond.c
> @@ -262,12 +262,10 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
>   			{
>   				/* Append dev:subdev to devpriv->name */
>   				char buf[20];
> -				int left =
> -				    MAX_BOARD_NAME - strlen(devpriv->name) - 1;
>   				snprintf(buf, sizeof(buf), "%u:%u ",
>   					 bdev->minor, bdev->subdev);
> -				buf[sizeof(buf) - 1] = 0;
> -				strncat(devpriv->name, buf, left);
> +				strlcat(devpriv->name, buf,
> +					sizeof(devpriv->name));
>   			}
>
>   		}
>

Looks good.  Additionally, the #define MAX_BOARD_NAME could be 
eliminated as now it is only used to to set the length of the 'name' 
member in 'struct comedi_bond_private'.

Reviewed-by: Ian Abbott <abbotti@....co.uk>

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@....co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/