From: Ethan Zhao <ethan.kernel@gmail.com>
To: hans.verkuil@cisco.com, m.chehab@samsung.com,
gregkh@linuxfoundation.org, mchehab@redhat.com
Cc: linux-kernel@vger.kernel.org, Ethan Zhao <ethan.kernel@gmail.com>
Subject: [PATCH] [media] saa7146: fix a possible NULL pointer reference in saa7146_set_position
Date: Sun, 5 Jan 2014 10:08:00 +0800 [thread overview]
Message-ID: <1388887680-942-1-git-send-email-ethan.kernel@gmail.com> (raw)
Function saa7146_format_by_fourcc() may return NULL, reference of the returned
result would cause NULL pointer issue without checking.
Signed-off-by: Ethan Zhao <ethan.kernel@gmail.com>
---
drivers/media/common/saa7146/saa7146_hlp.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/media/common/saa7146/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c
index be746d1..3e23eab 100644
--- a/drivers/media/common/saa7146/saa7146_hlp.c
+++ b/drivers/media/common/saa7146/saa7146_hlp.c
@@ -575,6 +575,7 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int
*/
u32 base = (u32)(unsigned long)vv->ov_fb.base;
+ int which = 1;
struct saa7146_video_dma vdma1;
/* calculate memory offsets for picture, look if we shall top-down-flip */
@@ -608,10 +609,14 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int
vdma1.pitch *= -1;
}
- vdma1.base_page = sfmt->swap;
+ if (sfmt)
+ vdma1.base_page = sfmt->swap;
+ else
+ which = 0;
+
vdma1.num_line_byte = (vv->standard->v_field<<16)+vv->standard->h_pixels;
- saa7146_write_out_dma(dev, 1, &vdma1);
+ saa7146_write_out_dma(dev, which, &vdma1);
}
static void saa7146_set_output_format(struct saa7146_dev *dev, unsigned long palette)
--
1.8.3.4 (Apple Git-47)
next reply other threads:[~2014-01-05 2:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-05 2:08 Ethan Zhao [this message]
2014-01-05 6:14 ` [PATCH] [media] saa7146: fix a possible NULL pointer reference in saa7146_set_position Dmitry Torokhov
2014-01-06 5:47 ` Ethan Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388887680-942-1-git-send-email-ethan.kernel@gmail.com \
--to=ethan.kernel@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hans.verkuil@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.