block: free q->flush_rq in blk_init_allocated_queue error paths.
A message that is not in the archive (sent off-list or not yet received): [email protected]
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.
block/blk-core.c +6 -2
@@ -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);
Mike Snitzer
Acked-byQuoted 5 lines · Dave Jones
Commit
7982e90c3a("block: fixq->flush_rqNULL pointer crash on dm-mpath flush") moved an allocation toblk_init_allocated_queue(), but neglected to free that allocation on the error paths that follow.Signed-off-by Dave Jones <[email protected]>
Ngh.. thanks Dave!
/me hangs his head in shame...
Jens, really sorry about this oversight. I can take it on the chin and pick this up for Linus to take this week from linux-dm.git. Your call.
Quoted 9 lines · Mike Snitzer
Quoted 5 lines · Dave Jones
Commit
7982e90c3a("block: fixq->flush_rqNULL pointer crash on dm-mpath flush") moved an allocation toblk_init_allocated_queue(), but neglected to free that allocation on the error paths that follow.Signed-off-by Dave Jones <[email protected]>
Quoted 8 lines
Ngh.. thanks Dave!
/me hangs his head in shame...
Acked-by Mike Snitzer <[email protected]>Jens, really sorry about this oversight. I can take it on the chin and pick this up for Linus to take this week from linux-dm.git. Your call.
No worries, I'll shove it off to Linus today. Then I can punch you on the chin next week.
Signature · 1 line
Jens Axboe