diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-18 13:50:00 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-18 18:33:49 -0500 |
| commit | 8669aafdb5a46a57366dd1540fc475544071a9c9 (patch) | |
| tree | c30fc562aeb1b2c158844b4d30d5423414b719bc /block/ll_rw_blk.c | |
| parent | afc847b7ddcf636e524cf5b0de644bd3a9419a8c (diff) | |
| download | linux-8669aafdb5a46a57366dd1540fc475544071a9c9.tar.gz linux-8669aafdb5a46a57366dd1540fc475544071a9c9.tar.bz2 linux-8669aafdb5a46a57366dd1540fc475544071a9c9.zip | |
[PATCH] fix double-free in blk_init_queue_node()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block/ll_rw_blk.c')
| -rw-r--r-- | block/ll_rw_blk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 0ef2971a9e82..5fac138a5be1 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -1854,8 +1854,10 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) return NULL; q->node = node_id; - if (blk_init_free_list(q)) - goto out_init; + if (blk_init_free_list(q)) { + kmem_cache_free(requestq_cachep, q); + return NULL; + } /* * if caller didn't supply a lock, they get per-queue locking with @@ -1891,9 +1893,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) return q; } - blk_cleanup_queue(q); -out_init: - kmem_cache_free(requestq_cachep, q); + blk_put_queue(q); return NULL; } EXPORT_SYMBOL(blk_init_queue_node); |