Skip to content

Commit 6b41fb2

Browse files
committed
Merge tag 'driver-core-6.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver symbol lookup fix from Greg KH: "Here is one last fixup for your tree for 6.6-rc1. It resolves a problem with the way that symbol_get was changed in the module tree merge in your tree to fix up the DVB drivers which rely on this old api to attach new devices. As the changelog comment says: In commit 9011e49 ("modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules") the use of symbol_get is properly restricted to GPL-only marked symbols. This interacts oddly with the DVB logic which only uses dvb_attach() to load the dvb driver which then uses symbol_get(). Fix this up by properly marking all of the dvb_attach attach symbols as EXPORT_SYMBOL_GPL(). This has been acked by Hans from the V4L driver side, Luis from the module side, Mauro on the media side, and Christoph said it was the correct solution, and was tested by the original reporter of the issue. It has passed 0-day testing, but has not been in linux-next due to it only being sent yesterday" * tag 'driver-core-6.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: media: dvb: symbol fixup for dvb_attach()
2 parents 474197a + 86495af commit 6b41fb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+113
-113
lines changed

drivers/media/dvb-frontends/ascot2e.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ struct dvb_frontend *ascot2e_attach(struct dvb_frontend *fe,
533533
priv->i2c_address, priv->i2c);
534534
return fe;
535535
}
536-
EXPORT_SYMBOL(ascot2e_attach);
536+
EXPORT_SYMBOL_GPL(ascot2e_attach);
537537

538538
MODULE_DESCRIPTION("Sony ASCOT2E terr/cab tuner driver");
539539
MODULE_AUTHOR("info@netup.ru");

drivers/media/dvb-frontends/atbm8830.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ struct dvb_frontend *atbm8830_attach(const struct atbm8830_config *config,
489489
return NULL;
490490

491491
}
492-
EXPORT_SYMBOL(atbm8830_attach);
492+
EXPORT_SYMBOL_GPL(atbm8830_attach);
493493

494494
MODULE_DESCRIPTION("AltoBeam ATBM8830/8831 GB20600 demodulator driver");
495495
MODULE_AUTHOR("David T. L. Wong <davidtlwong@gmail.com>");

drivers/media/dvb-frontends/au8522_dig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ struct dvb_frontend *au8522_attach(const struct au8522_config *config,
879879
au8522_release_state(state);
880880
return NULL;
881881
}
882-
EXPORT_SYMBOL(au8522_attach);
882+
EXPORT_SYMBOL_GPL(au8522_attach);
883883

884884
static const struct dvb_frontend_ops au8522_ops = {
885885
.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },

drivers/media/dvb-frontends/bcm3510.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ struct dvb_frontend* bcm3510_attach(const struct bcm3510_config *config,
835835
kfree(state);
836836
return NULL;
837837
}
838-
EXPORT_SYMBOL(bcm3510_attach);
838+
EXPORT_SYMBOL_GPL(bcm3510_attach);
839839

840840
static const struct dvb_frontend_ops bcm3510_ops = {
841841
.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },

drivers/media/dvb-frontends/cx22700.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,4 +432,4 @@ MODULE_DESCRIPTION("Conexant CX22700 DVB-T Demodulator driver");
432432
MODULE_AUTHOR("Holger Waechtler");
433433
MODULE_LICENSE("GPL");
434434

435-
EXPORT_SYMBOL(cx22700_attach);
435+
EXPORT_SYMBOL_GPL(cx22700_attach);

drivers/media/dvb-frontends/cx22702.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ struct dvb_frontend *cx22702_attach(const struct cx22702_config *config,
604604
kfree(state);
605605
return NULL;
606606
}
607-
EXPORT_SYMBOL(cx22702_attach);
607+
EXPORT_SYMBOL_GPL(cx22702_attach);
608608

609609
static const struct dvb_frontend_ops cx22702_ops = {
610610
.delsys = { SYS_DVBT },

drivers/media/dvb-frontends/cx24110.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,4 +653,4 @@ MODULE_DESCRIPTION("Conexant CX24110 DVB-S Demodulator driver");
653653
MODULE_AUTHOR("Peter Hettkamp");
654654
MODULE_LICENSE("GPL");
655655

656-
EXPORT_SYMBOL(cx24110_attach);
656+
EXPORT_SYMBOL_GPL(cx24110_attach);

drivers/media/dvb-frontends/cx24113.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
590590

591591
return NULL;
592592
}
593-
EXPORT_SYMBOL(cx24113_attach);
593+
EXPORT_SYMBOL_GPL(cx24113_attach);
594594

595595
module_param(debug, int, 0644);
596596
MODULE_PARM_DESC(debug, "Activates frontend debugging (default:0)");

drivers/media/dvb-frontends/cx24116.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
11331133
state->frontend.demodulator_priv = state;
11341134
return &state->frontend;
11351135
}
1136-
EXPORT_SYMBOL(cx24116_attach);
1136+
EXPORT_SYMBOL_GPL(cx24116_attach);
11371137

11381138
/*
11391139
* Initialise or wake up device

drivers/media/dvb-frontends/cx24120.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ struct dvb_frontend *cx24120_attach(const struct cx24120_config *config,
305305
kfree(state);
306306
return NULL;
307307
}
308-
EXPORT_SYMBOL(cx24120_attach);
308+
EXPORT_SYMBOL_GPL(cx24120_attach);
309309

310310
static int cx24120_test_rom(struct cx24120_state *state)
311311
{

0 commit comments

Comments
 (0)