From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795034885; b=FwoQfvampvM8zBbQBVwq3olql2eI+xEPbCmHf3Lx1rU8ihQhU5pMgttcajBr7ohGzXvf KJMMCJwhpSkpwXaz6LP+lKK90fSYidFektYG9niW79A1TQv4glAGVHFp2VOp4wwGw3eOZ hIf7YcPbNwrZG9VmkXh4z/S8yHcmSRxLe1uXfiUJ2b6gafwoHOXqJRt2y020+LdBPp9e2 MQZgghqybUqheDkcmykO6PU/vQ+CHhz2i8Z1PjwSnHNMq/f4mra/x2ZCup6SPHEGRyYPA hYtzIByW20yMumll2QtCfjUxM00vmckaVSMdnSu6/0c17mKwu9KRWz76S+Bb0L2Sqeg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795034885; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=jZGkPFqEiWft7HMYzyC4OgEeCtm9FlAQnlCuF3UohF4=; b=sfw5QC10rv+TcBdUe1ehcJy4KMZrDGwFqNuVS1jkm57TJS7k4NXG54jfoByncYk/1Hw3 jK2LYhEbx5AXZ/aTXI706mqaHh591uqZSQ98u5eZU0hw98+QAR2LkGTREGBx+ral+PTDe YvPsNCVg9CmlE9vLoY2TMYS01qJp9qfr3Nuqpeku+F/BwGw7Llw5FIoE9c3Xs6gwOCO6i pZ1qwU/D/sBYA1CpR5uhonwK/UIqyjCCeOgciSRXQnlZQkT3QF7ezMYq9k7JbHXXHDwbO iGhN6fyQNE/1KZlLMt+F7XD8NRd+hqnCYp3L4DkA2Tf96A29SpFJ3NOOjvtARrBKV3w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OAr4r2ir; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6BA8606A320; Wed, 18 Nov 2026 20:48:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=OAr4r2ir Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADCA71F000C4; Wed, 18 Nov 2026 20:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795034885; bh=jZGkPFqEiWft7HMYzyC4OgEeCtm9FlAQnlCuF3UohF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OAr4r2irtXF0f5dpJssBZbSLOH/BiespW9InhTylXSdOsDeWvocIuTYywuTC+hyJT XkUxHzw2GgAMjI7XgSePOrAOfCF0VFyRT4r/aQTk9/xiyOIvEQB9yt8O0F/HLz6yYs sd4mO/OZ4pU9SzxEvnOtTvTLjTXoToYcy2O1xLxM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+675c91651049ad042c5f@syzkaller.appspotmail.com, Mikulas Patocka , Sasha Levin Subject: [PATCH 6.6 0527/3318] dm-integrity: validate the superblock on resume Date: Wed, 18 Nov 2026 15:19:09 +0100 Message-ID: <20261118150333.012078823@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150313.527275416@linuxfoundation.org> References: <20261118150313.527275416@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mikulas Patocka [ Upstream commit fc79aeb86a2c244c1f1894e2d8f2966fe2b60fa2 ] dm_integrity_resume() re-reads the superblock from the device so that it picks up the flags and the recalculate position. It performs no validation on the result, while the constructor validates the superblock it reads and sizes all the in-memory structures according to it. The user may modify the superblock on the underlying device while the dm-integrity device is suspended, so that the two no longer agree. In particular, access_journal_data() shifts the journal entry index by ic->sb->log2_sectors_per_block, while ic->journal_section_sectors and the journal page list were computed with the value that was present at constructor time. Increasing log2_sectors_per_block makes the index run past the end of the journal, and dm-integrity then writes 512 bytes through lowmem_page_address(NULL). Snapshot the validated superblock in the constructor and refuse to resume if any of the fields that describe the on-disk geometry changed. Reported-by: syzbot+675c91651049ad042c5f@syzkaller.appspotmail.com Signed-off-by: Mikulas Patocka Cc: stable@vger.kernel.org Fixes: 118ba36e446c ("dm-integrity: fix recalculation in bitmap mode") Assisted-by: Claude:claude-opus-5 [ sashal: Dropped the inline-mode pieces (SB_FLAG_INLINE and the mode 'I' check) and added a recovery-mode ('R') wrapper so resume restores sb_copy without failing. ] Signed-off-by: Sasha Levin --- drivers/md/dm-integrity.c | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 1259bdf7b2c3b..a39fe0a37b1bc 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -172,6 +172,7 @@ struct dm_integrity_c { struct dm_bufio_client *bufio; struct workqueue_struct *metadata_wq; struct superblock *sb; + struct superblock *sb_copy; unsigned int journal_pages; unsigned int n_bitmap_blocks; @@ -3250,6 +3251,34 @@ static void dm_integrity_postsuspend(struct dm_target *ti) ic->journal_uptodate = true; } +/* + * The superblock is re-read from the device on every resume, so that we pick + * up the flags and the recalculate position. The geometry described by the + * superblock must not change though - the in-memory structures (and the + * journal in particular) were sized according to the superblock that was + * validated in the constructor. Reject a superblock that was modified behind + * our back. + * + * Only the fields that the driver never rewrites may be tested here. In + * particular, "version" is recalculated by sb_set_version on every superblock + * write and it depends on SB_FLAG_RECALCULATING and SB_FLAG_DIRTY_BITMAP, and + * SB_FLAG_DISCARD_KEYED may be set by dm_integrity_resume itself. + */ +static bool superblock_changed(struct dm_integrity_c *ic) +{ + const __le32 immutable_flags = cpu_to_le32(SB_FLAG_HAVE_JOURNAL_MAC | + SB_FLAG_FIXED_PADDING | + SB_FLAG_FIXED_HMAC); + + return memcmp(ic->sb->magic, ic->sb_copy->magic, sizeof(ic->sb->magic)) != 0 || + ic->sb->log2_interleave_sectors != ic->sb_copy->log2_interleave_sectors || + ic->sb->integrity_tag_size != ic->sb_copy->integrity_tag_size || + ic->sb->journal_sections != ic->sb_copy->journal_sections || + ic->sb->log2_sectors_per_block != ic->sb_copy->log2_sectors_per_block || + ((ic->sb->flags ^ ic->sb_copy->flags) & immutable_flags) != 0 || + memcmp(ic->sb->salt, ic->sb_copy->salt, SALT_SIZE) != 0; +} + static void dm_integrity_resume(struct dm_target *ti) { struct dm_integrity_c *ic = ti->private; @@ -3266,6 +3295,20 @@ static void dm_integrity_resume(struct dm_target *ti) if (r) dm_integrity_io_error(ic, "reading superblock", r); + if (unlikely(superblock_changed(ic))) { + /* + * Restore the superblock that we validated in the constructor, + * so that the rest of the driver doesn't operate on values + * that don't match the in-memory structures. + */ + memcpy(ic->sb, ic->sb_copy, sizeof(struct superblock)); + if (ic->mode != 'R') { + DMERR("The superblock was changed while the device was suspended"); + dm_integrity_io_error(ic, "superblock check", -EINVAL); + goto skip_writes; + } + } + if (ic->mode == 'R') goto skip_writes; @@ -4662,6 +4705,13 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv ic->just_formatted = true; } + ic->sb_copy = kmemdup(ic->sb, sizeof(struct superblock), GFP_KERNEL); + if (!ic->sb_copy) { + ti->error = "Cannot allocate superblock copy"; + r = -ENOMEM; + goto bad; + } + if (!ic->meta_dev) { r = dm_set_target_max_io_len(ti, 1U << ic->sb->log2_interleave_sectors); if (r) @@ -4756,6 +4806,7 @@ static void dm_integrity_dtr(struct dm_target *ti) kvfree(ic->journal_tree); if (ic->sb) free_pages_exact(ic->sb, SB_SECTORS << SECTOR_SHIFT); + kfree(ic->sb_copy); if (ic->internal_hash) crypto_free_shash(ic->internal_hash); -- 2.53.0