Re: [PATCH v2] stv6110x Fix kernel null pointer deref when plugging two TT s2-1600

[Guy Martin <gmsoft@tuxicoman.be>]

[-- Attachment #1: Type: text/plain, Size: 797 bytes --]


Hi Mauro,

Seems that I've sent the wrong patch. It contained additional things
which are irrelevant.

Attached the correct one.

Signed-off-by : Guy Martin <gmsoft@tuxicoman.be>

Regards,
  Guy

On Fri, 7 May 2010 09:05:15 +0200
Guy Martin <gmsoft@tuxicoman.be> wrote:

> 
> Hi Mauro,
> 
> > This fix seem to be at the wrong place. There's nothing on stv090x.c
> > that require a not null value for fe->tuner_priv.
> 
> Thanks for the review !
> 
> > So, a better fix for your bug is to add a check for fe->tuner_priv
> > inside stv6110x_sleep().
> 
> 
> Fix initialization of the TT s2-1600 card when plugging two of them in
> the same box. Check for fe->tuner_priv to be set when
> stv6110x_sleep() is called.
> 
> Signed-off-by : Guy Martin <gmsoft@tuxicoman.be>
> 
> 
> Regards,
>   Guy
> 


[-- Attachment #2: stv6110x-sleep-null-deref.patch --]
[-- Type: text/x-patch, Size: 510 bytes --]

diff -r 4a8d6d981f07 linux/drivers/media/dvb/frontends/stv6110x.c
--- a/linux/drivers/media/dvb/frontends/stv6110x.c	Wed May 05 11:58:44 2010 -0300
+++ b/linux/drivers/media/dvb/frontends/stv6110x.c	Fri May 07 08:51:18 2010 +0200
@@ -302,7 +302,10 @@
 
 static int stv6110x_sleep(struct dvb_frontend *fe)
 {
-	return stv6110x_set_mode(fe, TUNER_SLEEP);
+	if (fe->tuner_priv)
+		return stv6110x_set_mode(fe, TUNER_SLEEP);
+
+	return 0;
 }
 
 static int stv6110x_get_status(struct dvb_frontend *fe, u32 *status)