summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2016-03-08 21:40:51 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-05-07 15:27:07 +0200
commite57b36c0c46d7288d6d5bd602003b8fcd17efe3f (patch)
tree01f529695791ef148d2d18c571b0d29326d993a3 /drivers/media
parent[media] af9035: correct eeprom offsets (diff)
downloadlinux-e57b36c0c46d7288d6d5bd602003b8fcd17efe3f.tar.xz
linux-e57b36c0c46d7288d6d5bd602003b8fcd17efe3f.zip
[media] drivers/media/pci/zoran: avoid fragile snprintf use
Appending to a string by doing snprintf(buf, bufsize, "%s...", buf, ...) is not guaranteed to work. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/pci/zoran/videocodec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/pci/zoran/videocodec.c b/drivers/media/pci/zoran/videocodec.c
index c01071635290..13a3c07cd259 100644
--- a/drivers/media/pci/zoran/videocodec.c
+++ b/drivers/media/pci/zoran/videocodec.c
@@ -116,8 +116,9 @@ videocodec_attach (struct videocodec_master *master)
goto out_module_put;
}
- snprintf(codec->name, sizeof(codec->name),
- "%s[%d]", codec->name, h->attached);
+ res = strlen(codec->name);
+ snprintf(codec->name + res, sizeof(codec->name) - res,
+ "[%d]", h->attached);
codec->master_data = master;
res = codec->setup(codec);
if (res == 0) {