From d74aae4ea0257f3d6e94ef7a0420ef5074d6eb1e Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Tue, 5 Aug 2014 23:32:41 -0700 Subject: Documentation: freefall: simplify pathnames 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 Signed-off-by: Pavel Machek Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds --- Documentation/laptops/freefall.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Documentation/laptops/freefall.c b/Documentation/laptops/freefall.c index d4173186555c..5e44b20b1848 100644 --- a/Documentation/laptops/freefall.c +++ b/Documentation/laptops/freefall.c @@ -29,16 +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); - devname[sizeof(devname) - 1] = '\0'; 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; } -- cgit