From: Christoph Hellwig <hch@lst.de>
Date: Tue, 14 Sep 2021 07:06:55 +0000 (+0200)
Subject: block: check if a profile is actually registered in blk_integrity_unregister
X-Git-Tag: howlett/maple/20220722_2~2267^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=783a40a1b3ac7f3714d2776fa8ac8cce3535e4f6;p=users%2Fjedix%2Flinux-maple.git

block: check if a profile is actually registered in blk_integrity_unregister

While clearing the profile itself is harmless, we really should not clear
the stable writes flag if it wasn't set due to a registered integrity
profile.

Reported-by: Lihong Kou <koulihong@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20210914070657.87677-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 69a12177dfb6..48bfb53aa857 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -426,8 +426,12 @@ EXPORT_SYMBOL(blk_integrity_register);
  */
 void blk_integrity_unregister(struct gendisk *disk)
 {
+	struct blk_integrity *bi = &disk->queue->integrity;
+
+	if (!bi->profile)
+		return;
 	blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, disk->queue);
-	memset(&disk->queue->integrity, 0, sizeof(struct blk_integrity));
+	memset(bi, 0, sizeof(*bi));
 }
 EXPORT_SYMBOL(blk_integrity_unregister);