Re: [PATCHv3] Documentation: laptops: freefall.c: simplify to avoid null-termination problems

From: Randy Dunlap
Date: Mon Jul 28 2014 - 20:18:14 EST


On 07/28/14 04:13, Pavel Machek wrote:
>
> Copying to local variable is actually not neccessary, if all we need
> to do is snprintf(). This also removes problem where devname could be
> missing zero termination.
>
> Reported-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Pavel Machek <pavel@xxxxxx>

Applied. Thanks.

>
> diff --git a/Documentation/laptops/freefall.c b/Documentation/laptops/freefall.c
> index aab2ff0..5e44b20 100644
> --- a/Documentation/laptops/freefall.c
> +++ b/Documentation/laptops/freefall.c
> @@ -29,15 +29,12 @@ static const char app_name[] = "FREE FALL";
>
> static int set_unload_heads_path(char *device)
> {
> - char devname[64];
> -
> 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);
>
> snprintf(unload_heads_path, sizeof(unload_heads_path) - 1,
> - "/sys/block/%s/device/unload_heads", devname);
> + "/sys/block/%s/device/unload_heads", device+5);
> return 0;
> }
>
>
>
>


--
~Randy
--
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/