iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dm raid: fix missing reconfig_mutex unlock in raid_ctr() error paths

Browse Source 
[ Upstream commit bae3028799 ]

In the error paths 'bad_stripe_cache' and 'bad_check_reshape',
'reconfig_mutex' is still held after raid_ctr() returns.

Fixes: 9dbd1aa3a8 ("dm raid: add reshaping support to the target")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yu Kuai
2023-07-08 17:21:51 +08:00
committed by Greg Kroah-Hartman
parent ab197ad799
commit 2e687f8b5f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/md/dm-raid.c
View File

@ -3289,15 +3289,19 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
/* Try to adjust the raid4/5/6 stripe cache size to the stripe size */ /* Try to adjust the raid4/5/6 stripe cache size to the stripe size */
if (rs_is_raid456(rs)) { if (rs_is_raid456(rs)) {
r = rs_set_raid456_stripe_cache(rs); r = rs_set_raid456_stripe_cache(rs);
if (r) if (r) {
mddev_unlock(&rs->md);
goto bad_stripe_cache; goto bad_stripe_cache;
}
} }
/* Now do an early reshape check */ /* Now do an early reshape check */
if (test_bit(RT_FLAG_RESHAPE_RS, &rs->runtime_flags)) { if (test_bit(RT_FLAG_RESHAPE_RS, &rs->runtime_flags)) {
r = rs_check_reshape(rs); r = rs_check_reshape(rs);
if (r) if (r) {
mddev_unlock(&rs->md);
goto bad_check_reshape; goto bad_check_reshape;
}
/* Restore new, ctr requested layout to perform check */ /* Restore new, ctr requested layout to perform check */
rs_config_restore(rs, &rs_layout); rs_config_restore(rs, &rs_layout);
@ -3306,6 +3310,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
r = rs->md.pers->check_reshape(&rs->md); r = rs->md.pers->check_reshape(&rs->md);
if (r) { if (r) {
ti->error = "Reshape check failed"; ti->error = "Reshape check failed";
mddev_unlock(&rs->md);
goto bad_check_reshape; goto bad_check_reshape;
} }
} }