Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35da7a30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block:
  block: fix use-after-free bug in blk throttle code
parents 5f05647d 7ad58c02

block/blk-core.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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);

block/blk-sysfs.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -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);