sdio: initialise SDIO functions and update card->sdio_funcs in lockstep
PATCH 12/20 sdio: initialise SDIO functions and update card->sdio_funcs in lockstep
From: Matt Fleming <[email protected]>
Daniel Drake noticed a crash in the error path of mmc_attach_sdio(). This bug is discussed at http://dev.laptop.org/ticket/9707.
BUG: unable to handle kernel paging request at 6b6b6c57 IP: [<b066d6e2>] sdio_remove_func+0x9/0x27 Call Trace: [<b066cfb4>] ? mmc_sdio_remove+0x34/0x65 [<b066d1fc>] ? mmc_attach_sdio+0x217/0x240 [<b066a22f>] ? mmc_rescan+0x1a2/0x20f [<b042e9a0>] ? worker_thread+0x156/0x1e
We need to accurately track how many SDIO functions have been initialised (and keep card->sdio_funcs in sync) so that we don't try to remove more functions than we initialised if we hit the error path in mmc_attach_sdio().
Without this patch if we hit the error path in mmc_attach_sdio() we run the risk of deferencing invalid memory in sdio_remove_func(), leading to a crash.
Signed-off-by Matt Fleming <[email protected]>
Cc Daniel Drake <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mmc/core/sdio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mmc/core/sdio.c renamed from drivers/mmc/core/sdio.c~sdio-initialise-sdio-functions-and-update-card-sdio_funcs-in-lockstep +3 -2
@@ -516,7 +516,8 @@ int mmc_attach_sdio(struct mmc_host *hos* The number of functions on the card is encoded inside * the ocr. */ - card->sdio_funcs = funcs = (ocr &0x70000000 ) >>28 ; + funcs = (ocr &0x70000000 ) >>28 ; + card->sdio_funcs =0 ;/* * If needed, disconnect card detection pull-up resistor.
@@ -528,7 +529,7 @@ int mmc_attach_sdio(struct mmc_host *hos/* * Initialize (but don't add) all present functions. */ -for (i =0 ;i < funcs;i++) { +for (i =0 ; i < funcs; i++, card->sdio_funcs++) { err =sdio_init_func (host->card, i +1 );if (err) goto remove;
_