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 391/849] media: radio-wl1273: Avoid card name truncation
    Date
    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit dfadec236aa99f6086141949c9dc3ec50f3ff20d ]

    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, "Texas Instruments Wl1273 FM Rad".

    Suggested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Fixes: 87d1a50ce451 ("[media] V4L2: WL1273 FM Radio: TI WL1273 FM radio driver")
    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/radio/radio-wl1273.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
    index 1123768731676..484046471c03f 100644
    --- a/drivers/media/radio/radio-wl1273.c
    +++ b/drivers/media/radio/radio-wl1273.c
    @@ -1279,7 +1279,7 @@ static int wl1273_fm_vidioc_querycap(struct file *file, void *priv,

    strscpy(capability->driver, WL1273_FM_DRIVER_NAME,
    sizeof(capability->driver));
    - strscpy(capability->card, "Texas Instruments Wl1273 FM Radio",
    + strscpy(capability->card, "TI Wl1273 FM Radio",
    sizeof(capability->card));
    strscpy(capability->bus_info, radio->bus_type,
    sizeof(capability->bus_info));
    --
    2.33.0


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