mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
cfq-iosched: fix oom cfq_queue ref leak in cfq_set_request()
If the cfq_queue cached in cfq_io_cq is the oom one, cfq_set_request() replaces it by invoking cfq_get_queue() again without putting the oom queue leaking the reference it was holding. While oom queues are not released through reference counting, they're still reference counted and this can theoretically lead to the reference count overflowing and incorrectly invoke the usual release path on it. Fix it by making cfq_set_request() put the ref it was holding. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Jeff Moyer <jmoyer@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Arianna Avanzini <avanzini.arianna@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
parent
95e5d6f626
commit
bce6133b09
1 changed files with 2 additions and 0 deletions
|
@ -4299,6 +4299,8 @@ cfq_set_request(struct request_queue *q, struct request *rq, struct bio *bio,
|
||||||
new_queue:
|
new_queue:
|
||||||
cfqq = cic_to_cfqq(cic, is_sync);
|
cfqq = cic_to_cfqq(cic, is_sync);
|
||||||
if (!cfqq || cfqq == &cfqd->oom_cfqq) {
|
if (!cfqq || cfqq == &cfqd->oom_cfqq) {
|
||||||
|
if (cfqq)
|
||||||
|
cfq_put_queue(cfqq);
|
||||||
cfqq = cfq_get_queue(cfqd, is_sync, cic, bio, gfp_mask);
|
cfqq = cfq_get_queue(cfqd, is_sync, cic, bio, gfp_mask);
|
||||||
cic_set_cfqq(cic, cfqq, is_sync);
|
cic_set_cfqq(cic, cfqq, is_sync);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue