Re: [PATCH] Documentation: laptops: freefall.c: Cleaning up missing null-terminate in conjunction with strncpy

From: Pavel Machek
Date: Mon Jul 28 2014 - 06:20:48 EST


On Sun 2014-07-27 16:03:44, Randy Dunlap wrote:
> On 07/27/14 07:40, Rickard Strandqvist wrote:
> > Added a guaranteed null-terminate after call to strncpy.
> >
> > Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
> > ---
> > Documentation/laptops/freefall.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/laptops/freefall.c b/Documentation/laptops/freefall.c
> > index aab2ff0..113d004 100644
> > --- a/Documentation/laptops/freefall.c
> > +++ b/Documentation/laptops/freefall.c
> > @@ -33,8 +33,10 @@ static int set_unload_heads_path(char *device)
> >
> > if (strlen(device) <= 5 || strncmp(device, "/dev/", 5) != 0)
> > return -EINVAL;
> > - strncpy(devname, device + 5, sizeof(devname) - 1);
> > - strncpy(device_path, device, sizeof(device_path) - 1);
>
> Maybe I am overlooking something here, but what was wrong with
> the - 1 (2 times) above? and then just add the 2 lines below that set the
> last byte to '\0'?

Actually device_path is static, so it will be zero-initialized and
explicit set is not neccessary AFAICT.

(devname is auto -> needs explicit set).
Pavel

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/