From: Mikulas Patocka <mpatocka@redhat.com>
Date: Wed, 20 Jan 2021 11:02:31 +0000 (-0500)
Subject: dm integrity: fix a crash if "recalculate" used without "internal_hash"
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~363^2~2271
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=de4fabc02a58daf85b85cc3e770835e4d77bbc54;p=linux.git

dm integrity: fix a crash if "recalculate" used without "internal_hash"

commit 2d06dfecb132a1cc2e374a44eae83b5c4356b8b4 upstream.

Recalculate can only be specified with internal_hash.

Cc: stable@vger.kernel.org # v4.19+
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>
---

diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 81df019ab284..cce203adcf77 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -4235,6 +4235,12 @@ try_smaller_buffer:
 			r = -ENOMEM;
 			goto bad;
 		}
+	} else {
+		if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING)) {
+			ti->error = "Recalculate can only be specified with internal_hash";
+			r = -EINVAL;
+			goto bad;
+		}
 	}
 
 	ic->bufio = dm_bufio_client_create(ic->meta_dev ? ic->meta_dev->bdev : ic->dev->bdev,