Never call dvb_frontend_detach if we failed to attach a frontend. This fixes
the following oops:
[8.172997] DVB: registering new adapter (TT-Budget S2-1600 PCI)
[8.209018] adapter has MAC addr = 00:d0:5c:cc:a7:29
[8.328665] Intel ICH :00:1f.5: PCI INT B - GSI 17 (level, low) - IRQ
17
[8.328753] Intel ICH :00:1f.5: setting latency timer to 64
[8.562047] DVB: Unable to find symbol stv090x_attach()
[8.562117] BUG: unable to handle kernel NULL pointer dereference at 00ac
[8.562239] IP: [e08b04a3] dvb_frontend_detach+0x4/0x67 [dvb_core]
Ref http://bugs.debian.org/575207
Also clean up if we are unable to register the tuner and LNB drivers
Signed-off-by: Bjørn Mork bj...@mork.no
Cc: sta...@kernel.org
Reported-by: Fladischer Michael fladischermich...@fladi.at
---
Oliver Endriss o.endr...@gmx.de writes:
Could you please extend your patch in a way
that it will also catch, if
- dvb_attach(stv6110x_attach,...)
- dvb_attach(isl6423_attach,...)
fail?
OK. Attempting, although I have no clue whether such failures are really
fatal or not...
This is version 2 of this patch, adding cleanup in case we fail to register
the two submodules used by this card/frontend. I'm not certain that this
additional cleanup is appropriate for stable as any failure to register
these will be handled cleanly AFAICS. But I have no way to test this.
This patch should apply cleanly to 2.6.32, 2.6.33, 2.6.34-rc2
This does not apply cleanly to git://linuxtv.org/v4l-dvb.git master. I will
followup with a similar patch for that branch
Please apply to stable if appropriate. If not, please apply version 1
of the patch, which fixes only the oops condition.
drivers/media/dvb/ttpci/budget.c | 42 -
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index e48380c..4666c1e 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -627,25 +627,29 @@ static void frontend_init(struct budget *budget)
tt1600_stv6110x_config,
budget-i2c_adap);
- tt1600_stv090x_config.tuner_init =
ctl-tuner_init;
- tt1600_stv090x_config.tuner_set_mode =
ctl-tuner_set_mode;
- tt1600_stv090x_config.tuner_set_frequency =
ctl-tuner_set_frequency;
- tt1600_stv090x_config.tuner_get_frequency =
ctl-tuner_get_frequency;
- tt1600_stv090x_config.tuner_set_bandwidth =
ctl-tuner_set_bandwidth;
- tt1600_stv090x_config.tuner_get_bandwidth =
ctl-tuner_get_bandwidth;
- tt1600_stv090x_config.tuner_set_bbgain=
ctl-tuner_set_bbgain;
- tt1600_stv090x_config.tuner_get_bbgain=
ctl-tuner_get_bbgain;
- tt1600_stv090x_config.tuner_set_refclk=
ctl-tuner_set_refclk;
- tt1600_stv090x_config.tuner_get_status=
ctl-tuner_get_status;
-
- dvb_attach(isl6423_attach,
- budget-dvb_frontend,
- budget-i2c_adap,
- tt1600_isl6423_config);
-
- } else {
- dvb_frontend_detach(budget-dvb_frontend);
- budget-dvb_frontend = NULL;
+ if (ctl) {
+ tt1600_stv090x_config.tuner_init
= ctl-tuner_init;
+ tt1600_stv090x_config.tuner_set_mode
= ctl-tuner_set_mode;
+
tt1600_stv090x_config.tuner_set_frequency = ctl-tuner_set_frequency;
+
tt1600_stv090x_config.tuner_get_frequency = ctl-tuner_get_frequency;
+
tt1600_stv090x_config.tuner_set_bandwidth = ctl-tuner_set_bandwidth;
+
tt1600_stv090x_config.tuner_get_bandwidth = ctl-tuner_get_bandwidth;
+ tt1600_stv090x_config.tuner_set_bbgain
= ctl-tuner_set_bbgain;
+ tt1600_stv090x_config.tuner_get_bbgain
= ctl-tuner_get_bbgain;
+ tt1600_stv090x_config.tuner_set_refclk
= ctl-tuner_set_refclk;
+ tt1600_stv090x_config.tuner_get_status
= ctl-tuner_get_status;
+
+ if (dvb_attach(isl6423_attach,
+ budget-dvb_frontend,
+ budget-i2c_adap,
+
