| From 6a40548630461d14251b178b4e60d4c6923ae694 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 3 Aug 2021 21:46:10 +0200 |
| Subject: media: tm6000: Avoid card name truncation |
| |
| 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 c46cbcfafab3f..8874b0b922eee 100644 |
| --- a/drivers/media/usb/tm6000/tm6000-video.c |
| +++ b/drivers/media/usb/tm6000/tm6000-video.c |
| @@ -854,8 +854,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 |
| |
