Commit 1f4bac39 authored by Yu Kuai's avatar Yu Kuai Committed by Zheng Zengkai
Browse files

Revert "block: Fix UAF in bd_link_disk_holder()" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60Q98


CVE: NA

--------------------------------

Official solution will be applied to mainline, and this solution can't
fix uaf for 'bd_holder_dir' thoroughly. hence revert this temporary
solution. Officail solution will be backported in the next patch.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 7f3cee19

fs/block_dev.c

+0 −2
Original line number Diff line number Diff line
@@ -1630,7 +1630,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, void *holder, 
		}

	}

	bdev->bd_openers++;

	kobject_get(bdev->bd_part->holder_dir);

	if (for_part)

		bdev->bd_part_count++;
@@ -1900,7 +1899,6 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part) 
	}

#endif



	kobject_put(bdev->bd_part->holder_dir);

	if (!--bdev->bd_openers) {

		WARN_ON_ONCE(bdev->bd_holders);

		sync_blockdev(bdev);