| From 7fc2e47f40dd77ab1fcbda6db89614a0173d89c7 Mon Sep 17 00:00:00 2001 |
| From: Mikulas Patocka <mpatocka@redhat.com> |
| Date: Mon, 17 Feb 2020 08:11:35 -0500 |
| Subject: dm integrity: fix invalid table returned due to argument count mismatch |
| |
| From: Mikulas Patocka <mpatocka@redhat.com> |
| |
| commit 7fc2e47f40dd77ab1fcbda6db89614a0173d89c7 upstream. |
| |
| If the flag SB_FLAG_RECALCULATE is present in the superblock, but it was |
| not specified on the command line (i.e. ic->recalculate_flag is false), |
| dm-integrity would return invalid table line - the reported number of |
| arguments would not match the real number. |
| |
| Fixes: 468dfca38b1a ("dm integrity: add a bitmap mode") |
| Cc: stable@vger.kernel.org # v5.2+ |
| Reported-by: Ondrej Kozina <okozina@redhat.com> |
| Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> |
| Signed-off-by: Mike Snitzer <snitzer@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/md/dm-integrity.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/md/dm-integrity.c |
| +++ b/drivers/md/dm-integrity.c |
| @@ -2975,7 +2975,7 @@ static void dm_integrity_status(struct d |
| DMEMIT(" meta_device:%s", ic->meta_dev->name); |
| if (ic->sectors_per_block != 1) |
| DMEMIT(" block_size:%u", ic->sectors_per_block << SECTOR_SHIFT); |
| - if (ic->recalculate_flag) |
| + if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING)) |
| DMEMIT(" recalculate"); |
| DMEMIT(" journal_sectors:%u", ic->initial_sectors - SB_SECTORS); |
| DMEMIT(" interleave_sectors:%u", 1U << ic->sb->log2_interleave_sectors); |
