Merge tag 'media/v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-block.git] / drivers / media / pci / cx88 / cx88-blackbird.c

diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 722dd101c9b06707439b745982d9314040b84419..6c0bb9fe4a31b9207ef441b744a8cefb9efc46c8 100644 (file)
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -803,7 +803,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
        struct cx8802_dev *dev = video_drvdata(file);
        struct cx88_core *core = dev->core;
 
-       strcpy(cap->driver, "cx88_blackbird");
+       strscpy(cap->driver, "cx88_blackbird", sizeof(cap->driver));
        sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
        return cx88_querycap(file, core, cap);
 }
@@ -814,7 +814,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
        if (f->index != 0)
                return -EINVAL;
 
-       strlcpy(f->description, "MPEG", sizeof(f->description));
+       strscpy(f->description, "MPEG", sizeof(f->description));
        f->pixelformat = V4L2_PIX_FMT_MPEG;
        f->flags = V4L2_FMT_FLAG_COMPRESSED;
        return 0;
@@ -995,7 +995,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
        if (t->index != 0)
                return -EINVAL;
 
-       strcpy(t->name, "Television");
+       strscpy(t->name, "Television", sizeof(t->name));
        t->capability = V4L2_TUNER_CAP_NORM;
        t->rangehigh  = 0xffffffffUL;
        call_all(core, tuner, g_tuner, t);