Commit 1cb3de83 authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman

block: fix double-free in the failure path of cgwb_bdi_init()

commit 5f478e4e upstream.

When !CONFIG_CGROUP_WRITEBACK, bdi has single bdi_writeback_congested
at bdi->wb_congested.  cgwb_bdi_init() allocates it with kzalloc() and
doesn't do further initialization.  This usually works fine as the
reference count gets bumped to 1 by wb_init() and the put from
wb_exit() releases it.

However, when wb_init() fails, it puts the wb base ref automatically
freeing the wb and the explicit kfree() in cgwb_bdi_init() error path
ends up trying to free the same pointer the second time causing a
double-free.

Fix it by explicitly initilizing the refcnt to 1 and putting the base
ref from cgwb_bdi_destroy().
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Fixes: a13f35e8 ("writeback: don't embed root bdi_writeback_congested in bdi_writeback")
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62c153f3
...@@ -757,15 +757,20 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi) ...@@ -757,15 +757,20 @@ static int cgwb_bdi_init(struct backing_dev_info *bdi)
if (!bdi->wb_congested) if (!bdi->wb_congested)
return -ENOMEM; return -ENOMEM;
atomic_set(&bdi->wb_congested->refcnt, 1);
err = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL); err = wb_init(&bdi->wb, bdi, 1, GFP_KERNEL);
if (err) { if (err) {
kfree(bdi->wb_congested); wb_congested_put(bdi->wb_congested);
return err; return err;
} }
return 0; return 0;
} }
static void cgwb_bdi_destroy(struct backing_dev_info *bdi) { } static void cgwb_bdi_destroy(struct backing_dev_info *bdi)
{
wb_congested_put(bdi->wb_congested);
}
#endif /* CONFIG_CGROUP_WRITEBACK */ #endif /* CONFIG_CGROUP_WRITEBACK */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment