lkml.org 
[lkml]   [2014]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectblock: free q->flush_rq in blk_init_allocated_queue error paths.
Commit 7982e90c3a ("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>

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);


\
 
 \ /
  Last update: 2014-03-19 20:41    [W:0.061 / U:111.892 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site