Commit 5692da2e authored Nov 08, 2023 by Christoph Hellwig Committed by Li Nan Nov 07, 2023

block: clear ->slave_dir when dropping the main slave_dir reference

mainline inclusion
from mainline-v6.2-rc1
commit d90db3b1
category: bugfix
bugzilla: 188733

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d90db3b1c8676bc88b4309c5a571333de2263b8e



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

Zero out the pointer to ->slave_dir so that the holder code doesn't
incorrectly treat the object as alive when add_disk failed or after
del_gendisk was called.

Fixes: 89f871af ("dm: delay registering the gendisk")
Reported-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Mike Snitzer <snitzer@kernel.org>
Link: https://lore.kernel.org/r/20221115141054.1051801-2-yukuai1@huaweicloud.com


Signed-off-by: Jens Axboe <axboe@kernel.dk>
conflict:
  block/genhd.c
Signed-off-by: Zhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>

parent 7a671a1c

block/genhd.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -908,6 +908,7 @@ static int __device_add_disk(struct device parent, struct gendisk disk,
		sysfs_remove_link(&ddev->kobj, "bdi");
		out_put_slave_dir:
		kobject_put(disk->slave_dir);
		disk->slave_dir = NULL;
		out_put_holder_dir:
		kobject_put(disk->part0.holder_dir);
		out_del_integrity:
		@@ -1059,6 +1060,7 @@ void del_gendisk(struct gendisk *disk)

		kobject_put(disk->part0.holder_dir);
		kobject_put(disk->slave_dir);
		disk->slave_dir = NULL;

		part_stat_set_all(&disk->part0, 0);
		disk->part0.stamp = 0;