| From 9729d6d282a6d7ce88e64c9119cecdf79edf4e88 Mon Sep 17 00:00:00 2001 |
| From: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Date: Mon, 29 Oct 2018 13:32:38 -0400 |
| Subject: media: vivid: set min width/height to a value > 0 |
| |
| From: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| |
| commit 9729d6d282a6d7ce88e64c9119cecdf79edf4e88 upstream. |
| |
| The capture DV timings capabilities allowed for a minimum width and |
| height of 0. So passing a timings struct with 0 values is allowed |
| and will later cause a division by zero. |
| |
| Ensure that the width and height must be >= 16 to avoid this. |
| |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Reported-by: syzbot+57c3d83d71187054d56f@syzkaller.appspotmail.com |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/platform/vivid/vivid-vid-common.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/media/platform/vivid/vivid-vid-common.c |
| +++ b/drivers/media/platform/vivid/vivid-vid-common.c |
| @@ -21,7 +21,7 @@ const struct v4l2_dv_timings_cap vivid_d |
| .type = V4L2_DV_BT_656_1120, |
| /* keep this initialization for compatibility with GCC < 4.4.6 */ |
| .reserved = { 0 }, |
| - V4L2_INIT_BT_TIMINGS(0, MAX_WIDTH, 0, MAX_HEIGHT, 14000000, 775000000, |
| + V4L2_INIT_BT_TIMINGS(16, MAX_WIDTH, 16, MAX_HEIGHT, 14000000, 775000000, |
| V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | |
| V4L2_DV_BT_STD_CVT | V4L2_DV_BT_STD_GTF, |
| V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_INTERLACED) |
