This is a note to let you know that I've just added the patch titled
mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
to the 2.6.38-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-sdhci-pci-fix-error-case-in-sdhci_pci_probe_slot.patch
and it can be found in the queue-2.6.38 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 9fdcdbb0d84922e7ccda2f717a04ea62629f7e18 Mon Sep 17 00:00:00 2001
From: Chris Ball <[email protected]>
Date: Tue, 29 Mar 2011 00:46:12 -0400
Subject: mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
From: Chris Ball <[email protected]>
commit 9fdcdbb0d84922e7ccda2f717a04ea62629f7e18 upstream.
If pci_ioremap_bar() fails during probe, we "goto release;" and free the
host, but then we return 0 -- which tells sdhci_pci_probe() that the probe
succeeded. Since we think the probe succeeded, when we unload sdhci we'll
go to sdhci_pci_remove_slot() and it will try to dereference slot->host,
which is now NULL because we freed it in the error path earlier.
The patch simply sets ret appropriately, so that sdhci_pci_probe() will
detect the failure immediately and bail out.
Signed-off-by: Chris Ball <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/mmc/host/sdhci-pci.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -961,6 +961,7 @@ static struct sdhci_pci_slot * __devinit
host->ioaddr = pci_ioremap_bar(pdev, bar);
if (!host->ioaddr) {
dev_err(&pdev->dev, "failed to remap registers\n");
+ ret = -ENOMEM;
goto release;
}
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.38/mmc-sdhci-pci-fix-error-case-in-sdhci_pci_probe_slot.patch
queue-2.6.38/mmc-sdhci-check-mrq-cmd-in-sdhci_tasklet_finish.patch
queue-2.6.38/mmc-fix-a-race-between-card-detect-rescan-and-clock-gate-work-instances.patch
queue-2.6.38/mmc-sdhci-check-mrq-null-in-sdhci_tasklet_finish.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
