Jiri Slaby d9f6d3
From: Yu Kuai <yukuai3@huawei.com>
Jiri Slaby d9f6d3
Date: Tue, 7 Mar 2023 18:55:52 +0800
Jiri Slaby d9f6d3
Subject: [PATCH] block: fix wrong mode for blkdev_put() from
Jiri Slaby d9f6d3
 disk_scan_partitions()
Jiri Slaby d9f6d3
References: bsc#1012628
Jiri Slaby d9f6d3
Patch-mainline: 6.2.7
Jiri Slaby d9f6d3
Git-commit: 428913bce1e67ccb4dae317fd0332545bf8c9233
Jiri Slaby d9f6d3
Jiri Slaby d9f6d3
[ Upstream commit 428913bce1e67ccb4dae317fd0332545bf8c9233 ]
Jiri Slaby d9f6d3
Jiri Slaby d9f6d3
If disk_scan_partitions() is called with 'FMODE_EXCL',
Jiri Slaby d9f6d3
blkdev_get_by_dev() will be called without 'FMODE_EXCL', however, follow
Jiri Slaby d9f6d3
blkdev_put() is still called with 'FMODE_EXCL', which will cause
Jiri Slaby d9f6d3
'bd_holders' counter to leak.
Jiri Slaby d9f6d3
Jiri Slaby d9f6d3
Fix the problem by using the right mode for blkdev_put().
Jiri Slaby d9f6d3
Jiri Slaby d9f6d3
Reported-by: syzbot+2bcc0d79e548c4f62a59@syzkaller.appspotmail.com
Jiri Slaby d9f6d3
Link: https://lore.kernel.org/lkml/f9649d501bc8c3444769418f6c26263555d9d3be.camel@linux.ibm.com/T/
Jiri Slaby d9f6d3
Tested-by: Julian Ruess <julianr@linux.ibm.com>
Jiri Slaby d9f6d3
Fixes: e5cfefa97bcc ("block: fix scan partition for exclusively open device again")
Jiri Slaby d9f6d3
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Jiri Slaby d9f6d3
Reviewed-by: Jan Kara <jack@suse.cz>
Jiri Slaby d9f6d3
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jiri Slaby d9f6d3
Signed-off-by: Sasha Levin <sashal@kernel.org>
Jiri Slaby d9f6d3
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Jiri Slaby d9f6d3
---
Jiri Slaby d9f6d3
 block/genhd.c | 2 +-
Jiri Slaby d9f6d3
 1 file changed, 1 insertion(+), 1 deletion(-)
Jiri Slaby d9f6d3
Jiri Slaby d9f6d3
diff --git a/block/genhd.c b/block/genhd.c
Jiri Slaby d9f6d3
index 6cdaeb71..9c4c9aa5 100644
Jiri Slaby d9f6d3
--- a/block/genhd.c
Jiri Slaby d9f6d3
+++ b/block/genhd.c
Jiri Slaby d9f6d3
@@ -385,7 +385,7 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode)
Jiri Slaby d9f6d3
 	if (IS_ERR(bdev))
Jiri Slaby d9f6d3
 		ret =  PTR_ERR(bdev);
Jiri Slaby d9f6d3
 	else
Jiri Slaby d9f6d3
-		blkdev_put(bdev, mode);
Jiri Slaby d9f6d3
+		blkdev_put(bdev, mode & ~FMODE_EXCL);
Jiri Slaby d9f6d3
 
Jiri Slaby d9f6d3
 	if (!(mode & FMODE_EXCL))
Jiri Slaby d9f6d3
 		bd_abort_claiming(disk->part0, disk_scan_partitions);
Jiri Slaby d9f6d3
-- 
Jiri Slaby d9f6d3
2.35.3
Jiri Slaby d9f6d3