* [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat
@ 2014-10-12 12:23 Rickard Strandqvist
2014-10-13 9:14 ` Ian Abbott
2014-10-14 17:10 ` Hartley Sweeten
0 siblings, 2 replies; 4+ messages in thread
From: Rickard Strandqvist @ 2014-10-12 12:23 UTC (permalink / raw)
To: Ian Abbott, H Hartley Sweeten
Cc: Rickard Strandqvist, Greg Kroah-Hartman, Chase Southwood, devel,
linux-kernel
Changed from using strncat to strlcat to simplify the code
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.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));
}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat
2014-10-12 12:23 [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat Rickard Strandqvist
@ 2014-10-13 9:14 ` Ian Abbott
2014-10-13 20:38 ` Rickard Strandqvist
2014-10-14 17:10 ` Hartley Sweeten
1 sibling, 1 reply; 4+ messages in thread
From: Ian Abbott @ 2014-10-13 9:14 UTC (permalink / raw)
To: Rickard Strandqvist, H Hartley Sweeten
Cc: Greg Kroah-Hartman, Chase Southwood, devel, linux-kernel
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@spectrumdigital.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@mev.co.uk>
--
-=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=-
-=( Web: http://www.mev.co.uk/ )=-
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat
2014-10-13 9:14 ` Ian Abbott
@ 2014-10-13 20:38 ` Rickard Strandqvist
0 siblings, 0 replies; 4+ messages in thread
From: Rickard Strandqvist @ 2014-10-13 20:38 UTC (permalink / raw)
To: Ian Abbott
Cc: H Hartley Sweeten, Greg Kroah-Hartman, Chase Southwood, devel,
linux-kernel@vger.kernel.org
2014-10-13 11:14 GMT+02:00 Ian Abbott <abbotti@mev.co.uk>:
> 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@spectrumdigital.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@mev.co.uk>
Hi
Sounds like a good idea Ian.
I'll send a new patch where I removed the MAX_BOARD_NAME tomorrow.
Kind regards
Rickard Strandqvist
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat
2014-10-12 12:23 [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat Rickard Strandqvist
2014-10-13 9:14 ` Ian Abbott
@ 2014-10-14 17:10 ` Hartley Sweeten
1 sibling, 0 replies; 4+ messages in thread
From: Hartley Sweeten @ 2014-10-14 17:10 UTC (permalink / raw)
To: Rickard Strandqvist, Ian Abbott
Cc: Greg Kroah-Hartman, Chase Southwood, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
On Sunday, October 12, 2014 5:23 AM, Rickard Strandqvist wrote:
>
> Changed from using strncat to strlcat to simplify the code
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.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));
> }
>
> }
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-10-14 17:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-12 12:23 [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat Rickard Strandqvist
2014-10-13 9:14 ` Ian Abbott
2014-10-13 20:38 ` Rickard Strandqvist
2014-10-14 17:10 ` Hartley Sweeten
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox