Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e203152b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

PCI: keystone: Don't discard .remove() callback 

commit 200bddbb3f5202bbce96444fdc416305de14f547 upstream.

With CONFIG_PCIE_KEYSTONE=y and ks_pcie_remove() marked with __exit, the
function is discarded from the driver. In this case a bound device can
still get unbound, e.g via sysfs. Then no cleanup code is run resulting in
resource leaks or worse.

The right thing to do is do always have the remove callback available.
Note that this driver cannot be compiled as a module, so ks_pcie_remove()
was always discarded before this change and modpost couldn't warn about
this issue. Furthermore the __ref annotation also prevents a warning.

Fixes: 0c4ffcfe ("PCI: keystone: Add TI Keystone PCIe driver")
Link: https://lore.kernel.org/r/20231001170254.2506508-4-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9188f47c

drivers/pci/controller/dwc/pci-keystone.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -376,7 +376,7 @@ static const struct dw_pcie_ops dw_pcie_ops = { 
	.link_up = ks_dw_pcie_link_up,

	.link_up = ks_dw_pcie_link_up,

};

};





static int __exit ks_pcie_remove(struct platform_device *pdev)

static int ks_pcie_remove(struct platform_device *pdev)

{

{

	struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev);

	struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev);
@@ -454,7 +454,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 




static struct platform_driver ks_pcie_driver __refdata = {

static struct platform_driver ks_pcie_driver __refdata = {

	.probe  = ks_pcie_probe,

	.probe  = ks_pcie_probe,

	.remove = __exit_p(ks_pcie_remove),

	.remove = ks_pcie_remove,

	.driver = {

	.driver = {

		.name	= "keystone-pcie",

		.name	= "keystone-pcie",

		.of_match_table = of_match_ptr(ks_pcie_of_match),

		.of_match_table = of_match_ptr(ks_pcie_of_match),