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

    [ Upstream commit 2908249f3878a591f7918368fdf0b7b0a6c3158c ]

    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, "Silicon Labs Si470x FM Radio Re".

    Suggested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Fixes: 78656acdcf48 ("V4L/DVB (7038): USB radio driver for Silicon Labs Si470x FM Radio Receivers")
    Fixes: cc35bbddfe10 ("V4L/DVB (12416): radio-si470x: add i2c driver for si470x")
    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/si470x/radio-si470x-i2c.c | 2 +-
    drivers/media/radio/si470x/radio-si470x-usb.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
    index f491420d7b538..a972c0705ac79 100644
    --- a/drivers/media/radio/si470x/radio-si470x-i2c.c
    +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
    @@ -11,7 +11,7 @@

    /* driver definitions */
    #define DRIVER_AUTHOR "Joonyoung Shim <jy0922.shim@samsung.com>";
    -#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"
    +#define DRIVER_CARD "Silicon Labs Si470x FM Radio"
    #define DRIVER_DESC "I2C radio driver for Si470x FM Radio Receivers"
    #define DRIVER_VERSION "1.0.2"

    diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
    index fedff68d8c496..3f8634a465730 100644
    --- a/drivers/media/radio/si470x/radio-si470x-usb.c
    +++ b/drivers/media/radio/si470x/radio-si470x-usb.c
    @@ -16,7 +16,7 @@

    /* driver definitions */
    #define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>"
    -#define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"
    +#define DRIVER_CARD "Silicon Labs Si470x FM Radio"
    #define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers"
    #define DRIVER_VERSION "1.0.10"

    --
    2.33.0


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