diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-01-08 18:05:11 +0100 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-01-08 18:05:11 +0100 |
| commit | 9a4018764037eef8071fe8fd4815f64933c1d646 (patch) | |
| tree | 79f7ef4516df1d643ba8ff4987be6dbd254548d9 /linux/drivers/media/video/uvc/uvc_v4l2.c | |
| parent | 8b8d5d53029339f50706bc1a3b099cedae2abf6a (diff) | |
| download | mediapointer-dvb-s2-9a4018764037eef8071fe8fd4815f64933c1d646.tar.gz mediapointer-dvb-s2-9a4018764037eef8071fe8fd4815f64933c1d646.tar.bz2 | |
uvcvideo: replace strn{cpy,cat} with strl{cpy,cat}.
From: Laurent Pinchart <laurent.pinchart@skynet.be>
strncpy is unsafe as it doesn't append a terminating NUL character when the
source string doesn't fit in the destination buffer. Replace it with strlcpy.
strncat is misused as its size argument refers to the source string, not the
destination buffer. Replace it with strlcat.
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_v4l2.c')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_v4l2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_v4l2.c b/linux/drivers/media/video/uvc/uvc_v4l2.c index f295d7169..9130349f4 100644 --- a/linux/drivers/media/video/uvc/uvc_v4l2.c +++ b/linux/drivers/media/video/uvc/uvc_v4l2.c @@ -55,7 +55,7 @@ static int uvc_v4l2_query_menu(struct uvc_video_device *video, return -EINVAL; menu_info = &mapping->menu_info[query_menu->index]; - strncpy(query_menu->name, menu_info->name, 32); + strlcpy(query_menu->name, menu_info->name, sizeof query_menu->name); return 0; } @@ -492,9 +492,9 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) struct v4l2_capability *cap = arg; memset(cap, 0, sizeof *cap); - strncpy(cap->driver, "uvcvideo", sizeof cap->driver); - strncpy(cap->card, vdev->name, 32); - strncpy(cap->bus_info, video->dev->udev->bus->bus_name, + strlcpy(cap->driver, "uvcvideo", sizeof cap->driver); + strlcpy(cap->card, vdev->name, sizeof cap->card); + strlcpy(cap->bus_info, video->dev->udev->bus->bus_name, sizeof cap->bus_info); cap->version = DRIVER_VERSION_NUMBER; if (video->streaming->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) @@ -626,7 +626,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) memset(input, 0, sizeof *input); input->index = index; - strncpy(input->name, iterm->name, sizeof input->name); + strlcpy(input->name, iterm->name, sizeof input->name); if (UVC_ENTITY_TYPE(iterm) == ITT_CAMERA) input->type = V4L2_INPUT_TYPE_CAMERA; break; @@ -688,7 +688,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) fmt->flags = 0; if (format->flags & UVC_FMT_FLAG_COMPRESSED) fmt->flags |= V4L2_FMT_FLAG_COMPRESSED; - strncpy(fmt->description, format->name, + strlcpy(fmt->description, format->name, sizeof fmt->description); fmt->description[sizeof fmt->description - 1] = 0; fmt->pixelformat = format->fcc; |