lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block

Browse Source 
* 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block:
  block: fix use-after-free bug in blk throttle code
This commit is contained in:
Linus Torvalds
2010-10-23 11:55:00 -07:00
parent 5f05647dd8 7ad58c0286
commit 35da7a307c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-core.c
View File

@@ -462,8 +462,6 @@ void blk_cleanup_queue(struct request_queue *q)
if (q->elevator) if (q->elevator)
elevator_exit(q->elevator); elevator_exit(q->elevator);
blk_throtl_exit(q);
blk_put_queue(q); blk_put_queue(q);
} }
EXPORT_SYMBOL(blk_cleanup_queue); EXPORT_SYMBOL(blk_cleanup_queue);

2
block/blk-sysfs.c
View File

@@ -471,6 +471,8 @@ static void blk_release_queue(struct kobject *kobj)
blk_sync_queue(q); blk_sync_queue(q);
blk_throtl_exit(q);
if (rl->rq_pool) if (rl->rq_pool)
mempool_destroy(rl->rq_pool); mempool_destroy(rl->rq_pool);