Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd0eb12f authored by Roel Kluin's avatar Roel Kluin Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a35c87c7

drivers/media/dvb/dvb-usb/dvb-usb-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/pwc/pwc-v4l.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

drivers/media/video/zoran/zoran_card.c

+1 −1
Original line number Diff line number Diff line
@@ -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)