summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/dvb-usb-v2/lmedm04.c
diff options
context:
space:
mode:
authorSyam Sidhardhan2013-02-24 22:47:18 +0100
committerMauro Carvalho Chehab2013-03-18 20:34:15 +0100
commit06f950f43f29eb0b5631c6d037d78319649ac3b0 (patch)
tree1bb7f1c2b0f6b28090df5992476157f8fd3c4fc2 /drivers/media/usb/dvb-usb-v2/lmedm04.c
parent[media] solo6x10: Maintainer change (diff)
downloadkernel-qcow2-linux-06f950f43f29eb0b5631c6d037d78319649ac3b0.tar.gz
kernel-qcow2-linux-06f950f43f29eb0b5631c6d037d78319649ac3b0.tar.xz
kernel-qcow2-linux-06f950f43f29eb0b5631c6d037d78319649ac3b0.zip
[media] lmedm04: Fix possible NULL pointer dereference
Check for (adap == NULL) has to done before accessing adap. Signed-off-by: Syam Sidhardhan <s.syam@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/lmedm04.c')
-rw-r--r--drivers/media/usb/dvb-usb-v2/lmedm04.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index f30c58cecbba..96804be0fffe 100644
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -1241,10 +1241,13 @@ static int lme2510_get_stream_config(struct dvb_frontend *fe, u8 *ts_type,
struct usb_data_stream_properties *stream)
{
struct dvb_usb_adapter *adap = fe_to_adap(fe);
- struct dvb_usb_device *d = adap_to_d(adap);
+ struct dvb_usb_device *d;
if (adap == NULL)
return 0;
+
+ d = adap_to_d(adap);
+
/* Turn PID filter on the fly by module option */
if (pid_filter == 2) {
adap->pid_filtering = 1;