V4L/DVB (12435): strlcpy() will always null terminate the string.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 326f7608954b..cead089bbb4f 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -19,7 +19,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
                 return -EINVAL;
         }
 
-        strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
+        strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
         d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
         d->i2c_adap.algo      = d->props.i2c_algo;
         d->i2c_adap.algo_data = NULL;
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 2876ce084510..bdb4ced57496 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -1033,7 +1033,7 @@ long pwc_video_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                         if (std->index != 0)
                                 return -EINVAL;
                         std->id = V4L2_STD_UNKNOWN;
-                        strncpy(std->name, "webcam", sizeof(std->name));
+                        strlcpy(std->name, "webcam", sizeof(std->name));
                         return 0;
                 }
 
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 40d07faa4a24..0c4d9b1f8e6f 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1168,7 +1168,7 @@ zoran_setup_videocodec (struct zoran *zr,
         m->type = 0;
 
         m->flags = CODEC_FLAG_ENCODER | CODEC_FLAG_DECODER;
-        strncpy(m->name, ZR_DEVNAME(zr), sizeof(m->name));
+        strlcpy(m->name, ZR_DEVNAME(zr), sizeof(m->name));
         m->data = zr;
 
         switch (type)