lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 393/849] media: tm6000: Avoid card name truncation
    Date
    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit 42bb98e420d454fef3614b70ea11cc59068395f6 ]

    The "card" string only holds 31 characters (and the terminating NUL).
    In order to avoid truncation, use a shorter card description instead of
    the current result, "Trident TVMaster TM5600/6000/60".

    Suggested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Fixes: e28f49b0b2a8 ("V4L/DVB: tm6000: fix some info messages")
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/tm6000/tm6000-video.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
    index 3f650ede0c3dc..e293f6f3d1bc9 100644
    --- a/drivers/media/usb/tm6000/tm6000-video.c
    +++ b/drivers/media/usb/tm6000/tm6000-video.c
    @@ -852,8 +852,7 @@ static int vidioc_querycap(struct file *file, void *priv,
    struct tm6000_core *dev = ((struct tm6000_fh *)priv)->dev;

    strscpy(cap->driver, "tm6000", sizeof(cap->driver));
    - strscpy(cap->card, "Trident TVMaster TM5600/6000/6010",
    - sizeof(cap->card));
    + strscpy(cap->card, "Trident TM5600/6000/6010", sizeof(cap->card));
    usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
    cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
    V4L2_CAP_DEVICE_CAPS;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:00    [W:2.499 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site