| commit | 8a1eee4fc8f7b4f98e375974ed31dd035959271b | |
| author | Chris Ball <cjb@laptop.org> | |
| Tue, 29 Mar 2011 04:46:12 +0000 (29 00:46 -0400) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 9 May 2011 23:04:43 +0000 (9 16:04 -0700) | ||
| tree | 9f15b903f26700ab89c97bffc368b13b760f0c38 | treesnapshot (tar.gz zip) |
| parent | 1f7d953f4de3f3079b9c83d1a23691d4e8c89650 | commitdiff |
mmc: sdhci-pci: Fix error case in sdhci_pci_probe_slot()
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>
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 | diffblobblamehistory |