2011-03-26 18:24:10

by Mariusz Kozlowski

[permalink] [raw]
Subject: [PATCH] [media] dib0700: fix possible NULL pointer dereference

Seems like 'adap->fe' test for NULL was meant to be before we dereference
that pointer.

Signed-off-by: Mariusz Kozlowski <[email protected]>
---
drivers/media/dvb/dvb-usb/dib0700_devices.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 97af266..b48f1e0 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -2439,12 +2439,11 @@ static int tfe7090pvr_frontend0_attach(struct dvb_usb_adapter *adap)

dib0700_set_i2c_speed(adap->dev, 340);
adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x90, &tfe7090pvr_dib7000p_config[0]);
-
- dib7090_slave_reset(adap->fe);
-
if (adap->fe == NULL)
return -ENODEV;

+ dib7090_slave_reset(adap->fe);
+
return 0;
}

--
1.7.0.4


2011-04-03 15:44:52

by Patrick Boettcher

[permalink] [raw]
Subject: Re: [PATCH] [media] dib0700: fix possible NULL pointer dereference

On Saturday 26 March 2011 19:23:56 Mariusz Kozlowski wrote:
> Seems like 'adap->fe' test for NULL was meant to be before we dereference
> that pointer.
>
> Signed-off-by: Mariusz Kozlowski <[email protected]>

Thanks, applied.

--
Patrick Boettcher - KernelLabs
http://www.kernellabs.com/