[patch 3/9] media: strncpy does not null terminate string

[akpm]

From: Roel Kluin <roel.kl...@gmail.com>

strlcpy() will always null terminate the string.

Signed-off-by: Roel Kluin <roel.kl...@gmail.com>
Cc: Mauro Carvalho Chehab <mche...@infradead.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---

 drivers/media/dvb/dvb-usb/dvb-usb-i2c.c |    2 +-
 drivers/media/video/pwc/pwc-v4l.c       |    2 +-
 drivers/media/video/zoran/zoran_card.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff -puN 
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c~media-strncpy-does-not-null-terminate-string
 drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
--- 
a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c~media-strncpy-does-not-null-terminate-string
+++ a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -19,7 +19,7 @@ int dvb_usb_i2c_init(struct dvb_usb_devi
                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 -puN 
drivers/media/video/pwc/pwc-v4l.c~media-strncpy-does-not-null-terminate-string 
drivers/media/video/pwc/pwc-v4l.c
--- 
a/drivers/media/video/pwc/pwc-v4l.c~media-strncpy-does-not-null-terminate-string
+++ a/drivers/media/video/pwc/pwc-v4l.c
@@ -1033,7 +1033,7 @@ long pwc_video_do_ioctl(struct file *fil
                        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 -puN 
drivers/media/video/zoran/zoran_card.c~media-strncpy-does-not-null-terminate-string
 drivers/media/video/zoran/zoran_card.c
--- 
a/drivers/media/video/zoran/zoran_card.c~media-strncpy-does-not-null-terminate-string
+++ a/drivers/media/video/zoran/zoran_card.c
@@ -1169,7 +1169,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)
_
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html