From: Márton Németh <[email protected]> Use strlcat() to append a string to the previously created first part. The strlcat() function limits the size of the string to the whole destination buffer.
The semantic match that finds this kind of problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression dev; expression phys; expression str; expression size; @@ usb_make_path(dev, phys, size); - strncat(phys, str, size); + strlcat(phys, str, size); // </smpl> Signed-off-by: Márton Németh <[email protected]> --- diff -u -p a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c --- a/drivers/media/video/usbvideo/konicawc.c 2009-09-10 00:13:59.000000000 +0200 +++ b/drivers/media/video/usbvideo/konicawc.c 2009-11-21 17:48:52.000000000 +0100 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname)); - strncat(cam->input_physname, "/input0", sizeof(cam->input_physname)); + strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname)); cam->input = input_dev = input_allocate_device(); if (!input_dev) { diff -u -p a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c --- a/drivers/media/video/usbvideo/quickcam_messenger.c 2009-09-10 00:13:59.000000000 +0200 +++ b/drivers/media/video/usbvideo/quickcam_messenger.c 2009-11-21 17:48:53.000000000 +0100 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname)); - strncat(cam->input_physname, "/input0", sizeof(cam->input_physname)); + strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname)); cam->input = input_dev = input_allocate_device(); if (!input_dev) { -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
