* [PATCH] V4L/DVB: dib0700: Prevent NULL pointer dereference during probe
@ 2010-09-26 14:25 Jean Delvare
2010-10-08 12:32 ` Jean Delvare
0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2010-09-26 14:25 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab
Commit 8dc09004978538d211ccc36b5046919489e30a55 assumes that
dev->rc_input_dev is always set. It is, however, NULL if dvb-usb was
loaded with option disable_rc_polling=1.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
---
drivers/media/dvb/dvb-usb/dib0700_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- linux-2.6.36-rc5.orig/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-09-24 17:17:16.000000000 +0200
+++ linux-2.6.36-rc5/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-09-26 15:04:59.000000000 +0200
@@ -674,7 +674,8 @@ static int dib0700_probe(struct usb_inte
dev->props.rc.core.bulk_mode = false;
/* Need a higher delay, to avoid wrong repeat */
- dev->rc_input_dev->rep[REP_DELAY] = 500;
+ if (dev->rc_input_dev)
+ dev->rc_input_dev->rep[REP_DELAY] = 500;
dib0700_rc_setup(dev);
--
Jean Delvare
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] V4L/DVB: dib0700: Prevent NULL pointer dereference during probe
2010-09-26 14:25 [PATCH] V4L/DVB: dib0700: Prevent NULL pointer dereference during probe Jean Delvare
@ 2010-10-08 12:32 ` Jean Delvare
2010-10-08 12:38 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2010-10-08 12:32 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: LMML
On Sun, 26 Sep 2010 16:25:53 +0200, Jean Delvare wrote:
> Commit 8dc09004978538d211ccc36b5046919489e30a55 assumes that
> dev->rc_input_dev is always set. It is, however, NULL if dvb-usb was
> loaded with option disable_rc_polling=1.
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> ---
> drivers/media/dvb/dvb-usb/dib0700_core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> --- linux-2.6.36-rc5.orig/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-09-24 17:17:16.000000000 +0200
> +++ linux-2.6.36-rc5/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-09-26 15:04:59.000000000 +0200
> @@ -674,7 +674,8 @@ static int dib0700_probe(struct usb_inte
> dev->props.rc.core.bulk_mode = false;
>
> /* Need a higher delay, to avoid wrong repeat */
> - dev->rc_input_dev->rep[REP_DELAY] = 500;
> + if (dev->rc_input_dev)
> + dev->rc_input_dev->rep[REP_DELAY] = 500;
>
> dib0700_rc_setup(dev);
>
The already applied commit 04cab131ce2a267b6777a98d68fbc0cae44d4ba8
(V4L/DVB: rc-core: increase repeat time) solves the problem in a
different way, so you can ignore my patch above, it is no longer needed.
--
Jean Delvare
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] V4L/DVB: dib0700: Prevent NULL pointer dereference during probe
2010-10-08 12:32 ` Jean Delvare
@ 2010-10-08 12:38 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 3+ messages in thread
From: Mauro Carvalho Chehab @ 2010-10-08 12:38 UTC (permalink / raw)
To: Jean Delvare; +Cc: LMML
Em 08-10-2010 09:32, Jean Delvare escreveu:
> On Sun, 26 Sep 2010 16:25:53 +0200, Jean Delvare wrote:
>> Commit 8dc09004978538d211ccc36b5046919489e30a55 assumes that
>> dev->rc_input_dev is always set. It is, however, NULL if dvb-usb was
>> loaded with option disable_rc_polling=1.
>>
>> Signed-off-by: Jean Delvare <khali@linux-fr.org>
>> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>> ---
>> drivers/media/dvb/dvb-usb/dib0700_core.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> --- linux-2.6.36-rc5.orig/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-09-24 17:17:16.000000000 +0200
>> +++ linux-2.6.36-rc5/drivers/media/dvb/dvb-usb/dib0700_core.c 2010-09-26 15:04:59.000000000 +0200
>> @@ -674,7 +674,8 @@ static int dib0700_probe(struct usb_inte
>> dev->props.rc.core.bulk_mode = false;
>>
>> /* Need a higher delay, to avoid wrong repeat */
>> - dev->rc_input_dev->rep[REP_DELAY] = 500;
>> + if (dev->rc_input_dev)
>> + dev->rc_input_dev->rep[REP_DELAY] = 500;
>>
>> dib0700_rc_setup(dev);
>>
>
> The already applied commit 04cab131ce2a267b6777a98d68fbc0cae44d4ba8
> (V4L/DVB: rc-core: increase repeat time) solves the problem in a
> different way, so you can ignore my patch above, it is no longer needed.
>
OK.
Yeah, we needed to move this to IR core, as other drivers were suffering the
same issue, due to RC core timeouts.
Cheers,
Mauro
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-08 12:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-26 14:25 [PATCH] V4L/DVB: dib0700: Prevent NULL pointer dereference during probe Jean Delvare
2010-10-08 12:32 ` Jean Delvare
2010-10-08 12:38 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox