diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2019-07-02 15:50:08 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-16 08:22:21 +0200 |
| commit | ecf99cdea02dcc792c27a52d1cf3e1c532551479 (patch) | |
| tree | c87006a9ea24316b10607ec034bb182d10440894 /drivers/md | |
| parent | 5e9a2ce6d3b4a50a0abf754505e5a5ca32bccde5 (diff) | |
| download | linux-stable-ecf99cdea02dcc792c27a52d1cf3e1c532551479.tar.gz linux-stable-ecf99cdea02dcc792c27a52d1cf3e1c532551479.tar.bz2 linux-stable-ecf99cdea02dcc792c27a52d1cf3e1c532551479.zip | |
dm thin metadata: check if in fail_io mode when setting needs_check
[ Upstream commit 54fa16ee532705985e6c946da455856f18f63ee1 ]
Check if in fail_io mode at start of dm_pool_metadata_set_needs_check().
Otherwise dm_pool_metadata_set_needs_check()'s superblock_lock() can
crash in dm_bm_write_lock() while accessing the block manager object
that was previously destroyed as part of a failed
dm_pool_abort_metadata() that ultimately set fail_io to begin with.
Also, update DMERR() message to more accurately describe
superblock_lock() failure.
Cc: stable@vger.kernel.org
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-thin-metadata.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c index ed3caceaed07..6a26afcc1fd6 100644 --- a/drivers/md/dm-thin-metadata.c +++ b/drivers/md/dm-thin-metadata.c @@ -2001,16 +2001,19 @@ int dm_pool_register_metadata_threshold(struct dm_pool_metadata *pmd, int dm_pool_metadata_set_needs_check(struct dm_pool_metadata *pmd) { - int r; + int r = -EINVAL; struct dm_block *sblock; struct thin_disk_superblock *disk_super; down_write(&pmd->root_lock); + if (pmd->fail_io) + goto out; + pmd->flags |= THIN_METADATA_NEEDS_CHECK_FLAG; r = superblock_lock(pmd, &sblock); if (r) { - DMERR("couldn't read superblock"); + DMERR("couldn't lock superblock"); goto out; } |