Skip to content

Commit

Permalink
caif_usb: use strlcpy() instead of strncpy()
Browse files Browse the repository at this point in the history
gcc-8 reports

net/caif/caif_usb.c: In function 'cfusbl_device_notify':
./include/linux/string.h:245:9: warning: '__builtin_strncpy' output may
be truncated copying 15 bytes from a string of length 15
[-Wstringop-truncation]

The compiler require that the input param 'len' of strncpy() should be
greater than the length of the src string, so that '\0' is copied as
well. We can just use strlcpy() to avoid this warning.

Signed-off-by: Xiongfeng Wang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Xiongfeng Wang authored and davem330 committed Jan 10, 2018
1 parent af60d61 commit b0d55b5
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions net/caif/caif_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,7 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what,
dev_add_pack(&caif_usb_type);
pack_added = true;

strncpy(layer->name, dev->name,
sizeof(layer->name) - 1);
layer->name[sizeof(layer->name) - 1] = 0;
strlcpy(layer->name, dev->name, sizeof(layer->name));

return 0;
}
Expand Down

0 comments on commit b0d55b5

Please sign in to comment.