From: Zhang Yi <yi.zhang@huawei.com>
Date: Mon, 13 Jul 2026 07:42:06 +0000 (+0800)
Subject: iomap: prevent ioend merge when io_private differs
X-Git-Tag: v7.2-rc5~1^2~5
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=c97cd6f447d8727af3d457bca3a9283a77dd70f8;p=thirdparty%2Fkernel%2Fstable.git

iomap: prevent ioend merge when io_private differs

Different io_private values indicate distinct completion contexts that
must not be merged together, as this could leak or corrupt the private
data associated with each ioend.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20260713074206.1768006-1-yi.zhang@huaweicloud.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Signed-off-by: Christian Brauner (Amutable) <brauner@kernel.org>
---

diff --git a/fs/iomap/ioend.c b/fs/iomap/ioend.c
index 0565328764c1..30468d51b5ad 100644
--- a/fs/iomap/ioend.c
+++ b/fs/iomap/ioend.c
@@ -385,6 +385,8 @@ static bool iomap_ioend_can_merge(struct iomap_ioend *ioend,
 
 	if (ioend->io_bio.bi_status != next->io_bio.bi_status)
 		return false;
+	if (ioend->io_private != next->io_private)
+		return false;
 	if (next->io_flags & IOMAP_IOEND_BOUNDARY)
 		return false;
 	if ((ioend->io_flags & IOMAP_IOEND_NOMERGE_FLAGS) !=