| From: Markus Elfring <elfring@users.sourceforge.net> |
| Date: Sun, 24 Sep 2017 05:00:57 -0400 |
| Subject: media: omap_vout: Fix a possible null pointer dereference in |
| omap_vout_open() |
| |
| commit bfba2b3e21b9426c0f9aca00f3cad8631b2da170 upstream. |
| |
| Move a debug message so that a null pointer access can not happen |
| for the variable "vout" in this function. |
| |
| Fixes: 5c7ab6348e7b3fcca2b8ee548306c774472971e2 ("V4L/DVB: V4L2: Add support for OMAP2/3 V4L2 display driver on top of DSS2") |
| |
| Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> |
| Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> |
| [bwh: Backported to 3.2: adjust filename] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/media/video/omap/omap_vout.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/media/video/omap/omap_vout.c |
| +++ b/drivers/media/video/omap/omap_vout.c |
| @@ -1003,11 +1003,12 @@ static int omap_vout_open(struct file *f |
| struct omap_vout_device *vout = NULL; |
| |
| vout = video_drvdata(file); |
| - v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__); |
| |
| if (vout == NULL) |
| return -ENODEV; |
| |
| + v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__); |
| + |
| /* for now, we only support single open */ |
| if (vout->opened) |
| return -EBUSY; |
