diff options
| author | Tony Battersby <tonyb@cybernetics.com> | 2015-02-11 11:32:30 -0500 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-03-02 13:17:12 +0000 |
| commit | c5caff734425cddbb1efe801e88ce2a39fdb052b (patch) | |
| tree | d3a6d39172e77760c6eff70027b381896c8986e5 /block | |
| parent | de8548cf2a413e77f8a7228282776aab09477d1a (diff) | |
| download | linux-stable-c5caff734425cddbb1efe801e88ce2a39fdb052b.tar.gz linux-stable-c5caff734425cddbb1efe801e88ce2a39fdb052b.tar.bz2 linux-stable-c5caff734425cddbb1efe801e88ce2a39fdb052b.zip | |
blk-mq: fix double-free in error path
commit 564e559f2baf6a868768d0cac286980b3cfd6e30 upstream.
If the allocation of bt->bs fails, then bt->map can be freed twice, once
in blk_mq_init_bitmap_tags() -> bt_alloc(), and once in
blk_mq_init_bitmap_tags() -> bt_free(). Fix by setting the pointer to
NULL after the first free.
Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-tag.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 1caaa7c4605d..b88f4b375c27 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -511,6 +511,7 @@ static int bt_alloc(struct blk_mq_bitmap_tags *bt, unsigned int depth, bt->bs = kzalloc(BT_WAIT_QUEUES * sizeof(*bt->bs), GFP_KERNEL); if (!bt->bs) { kfree(bt->map); + bt->map = NULL; return -ENOMEM; } |