block: ensure the bdi is freed after inode_detach_wb
Subsystems (2)
PATCH 1/1 block: ensure the bdi is freed after inode_detach_wb
inode_detach_wb references the "main" bdi of the inode. With the recent change to move the bdi from the request_queue to the gendisk this causes a guaranteed use after free when using certain cgroup configurations. The big itself is older through as any non-default inode reference (e.g. an open file descriptor) could have injected this use after free even before that.
Fixes 52ebea749aae ("writeback: make backing_dev_info host cgroup-specific bdi_writebacks")
Reported-by Qian Cai <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
Tested-by Qian Cai <[email protected]>
--- block/genhd.c | 1 - fs/block_dev.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-)
block/genhd.c +0 -1
@@ -1051,7 +1051,6 @@ static void disk_release(struct device *dev)might_sleep (); -bdi_put (disk->bdi);if (MAJOR (dev->devt) ==BLOCK_EXT_MAJOR )blk_free_ext_minor (MINOR (dev->devt));disk_release_events (disk);
fs/block_dev.c +4 -1
@@ -826,11 +826,14 @@ static void init_once(void *data)static void bdev_evict_inode (struct inode *inode) { +struct block_device *bdev =I_BDEV (inode); +truncate_inode_pages_final (&inode->i_data);invalidate_inode_buffers (inode);/* is it needed here? */ clear_inode (inode); -/* Detach inode from wb early as bdi_put() may free bdi->wb */ inode_detach_wb (inode); +if (!bdev_is_partition (bdev)) +bdi_put (bdev->bd_disk->bdi); }static const struct super_operations bdev_sops = {
Signature · 1 line
2.30.2