aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2014-03-20 15:03:58 -0600
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-20 22:32:06 -0700
commit708f04d2abf4e90abee61d9ffb1f165038017ecf (patch)
treec9a25407c8011c821da54ea51a4965c0e2a4f44d /block
parent11d4616bd07f38d496bd489ed8fad1dc4d928823 (diff)
downloadlinux-linaro-stable-708f04d2abf4e90abee61d9ffb1f165038017ecf.tar.gz
block: free q->flush_rq in blk_init_allocated_queue error paths
Commit 7982e90c3a57 ("block: fix q->flush_rq NULL pointer crash on dm-mpath flush") moved an allocation to blk_init_allocated_queue(), but neglected to free that allocation on the error paths that follow. Signed-off-by: Dave Jones <davej@fedoraproject.org> Acked-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 4cd5ffc18442..bfe16d5af9f9 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -713,7 +713,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
return NULL;
if (blk_init_rl(&q->root_rl, q, GFP_KERNEL))
- return NULL;
+ goto fail;
q->request_fn = rfn;
q->prep_rq_fn = NULL;
@@ -737,12 +737,16 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
/* init elevator */
if (elevator_init(q, NULL)) {
mutex_unlock(&q->sysfs_lock);
- return NULL;
+ goto fail;
}
mutex_unlock(&q->sysfs_lock);
return q;
+
+fail:
+ kfree(q->flush_rq);
+ return NULL;
}
EXPORT_SYMBOL(blk_init_allocated_queue);