p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mmc: queue: Improve error handling during allocation of bounce buffers 

Allocation of previous bounce buffer in mmc_init_queue when the current
bounce buffer allocation fails was leading to a crash later in
__blk_segment_map_sg. Error handling is improved by allocating previous
bounce buffer only if the current bounce buffer allocation succeeds.

Signed-off-by: Bhuvanesh Surachari <bhuvanesh_surachari@mentor.com>
Signed-off-by: Harish Jenny K N <harish_kandiga@mentor.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Bhuvanesh Surachari 2014-12-01 02:23:02 -05:00 committed by Ulf Hansson
parent 9d65cb88e5
commit fdb409f636
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/card/queue.c
View File

@ -232,8 +232,9 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
if (!mqrq_cur->bounce_buf) { if (!mqrq_cur->bounce_buf) {
pr_warn("%s: unable to allocate bounce cur buffer\n", pr_warn("%s: unable to allocate bounce cur buffer\n",
mmc_card_name(card)); mmc_card_name(card));
} } else {
mqrq_prev->bounce_buf = kmalloc(bouncesz, GFP_KERNEL); mqrq_prev->bounce_buf =
kmalloc(bouncesz, GFP_KERNEL);
if (!mqrq_prev->bounce_buf) { if (!mqrq_prev->bounce_buf) {
pr_warn("%s: unable to allocate bounce prev buffer\n", pr_warn("%s: unable to allocate bounce prev buffer\n",
mmc_card_name(card)); mmc_card_name(card));
@ -241,6 +242,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card,
mqrq_cur->bounce_buf = NULL; mqrq_cur->bounce_buf = NULL;
} }
} }
}
if (mqrq_cur->bounce_buf && mqrq_prev->bounce_buf) { if (mqrq_cur->bounce_buf && mqrq_prev->bounce_buf) {
blk_queue_bounce_limit(mq->queue, BLK_BOUNCE_ANY); blk_queue_bounce_limit(mq->queue, BLK_BOUNCE_ANY);