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=1794590610; b=XZPWatKAarMJFMsizcGEdbn202Xu7DLpKtLl02mXtEFj3AKq1b1EYjyOLszvwMHjfIjF 6Fi+SlqYVoFaWUsngpn7obnC5MpacKZmHYygNsn5TGnpI41Z4wTOFGa3Bfh4NaRMOi0zV QuG+0z394omabcqO4D8RBk+Ufvfv28IKt+XRph7+NpbBD7i6QWnq9DcnM0rMbTRiwqhR7 zYEiN6aNs8iOOYosP+Ugyq07+gHZq9Ylg8EsLullLSClJ1pfiAQ/tL7PAZSleQfJOMlA7 ibLoDbrUX3yb2kVXxAIQ6j7yRvdBEtClj21QchRfqhYVbUILg0jRvHyc7hOFKIQcQCw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590610; 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=aHco5E8ndyYXzntPJK8yJfmzQGmOn6t8Xq2hDp6Ug+Y=; b=omcOQcE4tURsEGJpZooiFDhLrW2r4uN/6aDBoqEQg6SDG/yD2b5LkbfhkMd+vwzIkVwB lYiZ1U9D4m4DGEt0va4otd0FFqzAMfyUkE4VRP3Bc/LSdTvIeLaEV7i1qranwiTxQk9UR h7u6u5KbYmGP7Dna4icpuCUuL1vfLOTJjvcRwhkeyWED1FEIWLjt2YSanLlZ/j2r6IOhc 8tssmbg0RL0cijJ5R04cZCKvPjD0cHjm6IFKqNm77i8cI0CaCPoyBzwE4iGy2Mk3p7SmW swNmF89xG9yZNj79QPRAJVdD4ommdJ+AAHqBiQP8tOfenBey8XNPOQIQYklR4eCXdPQ== 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=QmQt9MPd; 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 3A19C607584C; Fri, 13 Nov 2026 17:23:30 +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=QmQt9MPd Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8F1D1F000C7; Fri, 13 Nov 2026 17:23:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590610; bh=aHco5E8ndyYXzntPJK8yJfmzQGmOn6t8Xq2hDp6Ug+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QmQt9MPd8GEfkywKuhHUf/MdoFbICQvrisGVKOg+qwzuOXXsq0a3hCYPPIQ3qLakY +4AvfdefoQVxsrBEhILUHlKRr6+yKIX7IrsxzJFsMElah1srpoZqUFyZ0tQkgHsw37 eqZEqiNgbGW/GQE5JMnFZU+zVlNp6eAQV4BNIKDY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiaming Zhang , Andreas Gruenbacher , Sasha Levin Subject: [PATCH 6.18 510/686] gfs2: reject invalid inode sizes Date: Fri, 13 Nov 2026 10:50:43 -0500 Message-ID: <20261113153838.179031412@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiaming Zhang [ Upstream commit 33ed0a0567e0abe66ea65e89dad2e35082890fbe ] A corrupted GFS2 image can store a dinode size that is larger than what VFS i_size can represent. gfs2_dinode_in() reads the on-disk di_size as a u64 and writes it directly into inode->i_size. If the value is larger than S64_MAX, the incore i_size becomes negative. That negative value can bypass the existing stuffed inode size check: inode->i_size > gfs2_max_stuffed_size(ip) Later, gfs2_quotad may try to sync the quota file and unstuff the quota inode. gfs2_unstuffer_folio() reads the negative i_size into an unsigned length and passes it to memcpy(), turning it into a huge copy size and triggering a out-of-bound issue. Reject dinodes whose size exceeds sb->s_maxbytes before storing the value in inode->i_size. Also make the stuffed inode check use the raw on-disk size while it is still unsigned. Fixes: 70376c7ff312 ("gfs2: Always check inode size of inline inodes") Closes: https://lore.kernel.org/lkml/CANypQFaF6bvORKKbRALvEL0k_epFaneFiOQqco4gjdmKVbdURg@mail.gmail.com/ Assisted-by: Codex:gpt-5.5-xhigh Cc: stable@vger.kernel.org Signed-off-by: Jiaming Zhang Signed-off-by: Andreas Gruenbacher [ sashal: adjusted context for direct inode->i_state access and the absent adjacent directory-consistency check ] Signed-off-by: Sasha Levin --- fs/gfs2/glops.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 242e47926b39d..35ad44d13e8b6 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -392,6 +392,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) umode_t mode = be32_to_cpu(str->di_mode); struct inode *inode = &ip->i_inode; bool is_new = inode->i_state & I_NEW; + u64 size; if (unlikely(ip->i_no_addr != be64_to_cpu(str->di_num.no_addr))) { gfs2_consist_inode(ip); @@ -417,7 +418,12 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) i_uid_write(inode, be32_to_cpu(str->di_uid)); i_gid_write(inode, be32_to_cpu(str->di_gid)); set_nlink(inode, be32_to_cpu(str->di_nlink)); - i_size_write(inode, be64_to_cpu(str->di_size)); + size = be64_to_cpu(str->di_size); + if (unlikely(size > inode->i_sb->s_maxbytes)) { + gfs2_consist_inode(ip); + return -EIO; + } + i_size_write(inode, size); gfs2_set_inode_blocks(inode, be64_to_cpu(str->di_blocks)); atime.tv_sec = be64_to_cpu(str->di_atime); atime.tv_nsec = be32_to_cpu(str->di_atime_nsec); @@ -456,7 +462,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) ip->i_depth = (u8)depth; ip->i_entries = be32_to_cpu(str->di_entries); - if (gfs2_is_stuffed(ip) && inode->i_size > gfs2_max_stuffed_size(ip)) { + if (gfs2_is_stuffed(ip) && size > gfs2_max_stuffed_size(ip)) { gfs2_consist_inode(ip); return -EIO; } -- 2.53.0