lkml.org 
[lkml]   [2012]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 07/91] mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
2.6.27-longterm review patch.  If anyone has any objections, please let us know.

------------------

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 <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/mmc/host/sdhci-pci.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

Index: longterm-2.6.27/drivers/mmc/host/sdhci-pci.c
===================================================================
--- longterm-2.6.27.orig/drivers/mmc/host/sdhci-pci.c 2012-02-05 22:34:34.824917273 +0100
+++ longterm-2.6.27/drivers/mmc/host/sdhci-pci.c 2012-02-05 22:34:35.914915549 +0100
@@ -547,6 +547,7 @@
host->ioaddr = ioremap_nocache(addr, pci_resource_len(pdev, bar));
if (!host->ioaddr) {
dev_err(&pdev->dev, "failed to remap registers\n");
+ ret = -ENOMEM;
goto release;
}




\
 
 \ /
  Last update: 2012-02-05 23:51    [W:0.273 / U:17.644 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site