From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2E603BA236 for ; Mon, 6 Jul 2026 18:00:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783360814; cv=none; b=khOZcn0apO6SPgKusd1BmC8l10kSJGHRJiLIBzt1EWqvfeYPWiL94Sc49dFecaDocqozPTwM/rfw9mAT7sV29yuSwhJCOZkjqiByuHbMDCgZkTqj74yuhfh97s9HBWPfnRmTQMPxhnxyNRuJ0CKCYWa8THrwLssO1himfkhB/SQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783360814; c=relaxed/simple; bh=bsnh9gOaL7Rt2V+xeyeNRAfwOn3S2p6enNw0gjImK+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pGjU4fPYm1ItHUVK4wiRejWb23SGSjqZhHZgu6WmVHnwAp/hPJ3vu9Kh0/Fog6wE0gupaGT5MdRkOrHA3bpB5GlUME3zDC6hOQSgshaGAmYXKnM0HvdzPLMW87Aaf82LepCp09es5xfQ8M1vKMU2/noA6iBZ+O01HAg7YqsEumk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=M5y846/D; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M5y846/D" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2cca0c5799eso12412475ad.0 for ; Mon, 06 Jul 2026 11:00:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783360811; x=1783965611; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1i9opHM4bOHdKev3pbWNXUYFj+izXMcvOiuJ5Sb6Isg=; b=M5y846/DuX4UOzda7uWIICWGFGodw/V1ifn2QtF6j19meuUUn5GEf1LCo8S2AgBiyv NRGKuJqqZFADBBNW541GflpI3yq9Vw4mAHKLgQYeqvgwbM/qfrEdhTsssHmmHd5SNmF6 nItcviU66RhAFFbpAdDOYFbQwAM7Vr+9DcHSS4SI/yzrFdOicPL4h70KOvdoi+7jZJno 7jqekoG4mPzejT43gwju9lNRQfOVwgzgGqXWv7JOzMjcNR1VNBf0f/Z/bI79gjJe4ls7 94BsTtbj+rO9PmQK2gsT1vmC+zfea743StaK3zNAGCyKXG9enkwtZjgxifM/F8nr0SFm mFHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783360811; x=1783965611; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1i9opHM4bOHdKev3pbWNXUYFj+izXMcvOiuJ5Sb6Isg=; b=pNamqZbesIkMa+LqNNYG20h48Fg3Ug7eK3fJ8ro9bA9yLbsKD1yLXrSi9umzaw/Hmx q6M/T02cWViWZetpJb0NeJy0fozhw55sStl8u5NDqIg1VJaSbCOUe1zo2MPHtJ6Zwtqe lIOP0sAfAvZ+vnghYPjrChHnZKGctNUGKDxr4vEX6AEfqW6Usklzt4XybGk8tLujWjWD hAaMLUjQI0PyE7u8krt9tbRPcj/9DNfhzSNU8X8O1gw7h8XaVqOQlArOYyYdIORcfeSS Mzu47ScEs6/SjMJOWMmvv8kbWvEfmwIHhUPWJeSL3///NHSKz4RC0ScFaaDTMn1dDyjX qgcA== X-Forwarded-Encrypted: i=1; AHgh+Rqu+VgGg9qs241uo1kWUIThJAtC5lkJkTabmFZRdCdPN54wpUdl0zhknJX37AFe73eg+t3tTxeeL+2eEUM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy68H15Ck4Oo1ET9sd/cRH3efYgNJ18RgFAEAVhBewbJ7mYK1LG r69wu1i3LWHMxkeDFcxYAoGLLCts/C8eJIfuKghO5pttkErpittkA4VW X-Gm-Gg: AfdE7cnpwY2rMok9KJUuB5o7TnfBnMy1VkhJfsRMJf883CtOhbQ6780VYWeXHKRUGrU fMX3kTdMRglHPoMQ2UCPpsEhVup3JhgxSiM7lru5DQnR38KhCDQpGaDF3TWn1lgXTwio8ueMzUa bb9o/EncRcBpPyzhAg4N2k3pZT91lkznQqzXRvgVohmkOqoJjL9xbIgbEbPDy4J9mXbEme03Ike q8JwKr+aID9iE+xBxpAOCyy71VqnOqYl5D4nNQYn0ZXK/ysXPW0ckTvdH8dJ3RLyvAOufcGEIfk LmrTCSVbEKCDrDTk6K9lfTvuN7aE1BsvpC0RrDESKYOPY7ITho04+OOtrxJWRwe+hEfynb6gyqL KJRSGAv84eCO4Iy9Zj7Ptg/iVNjixO3OL+24n+1R693FLLs8JtYbq+ssq57PtfWmajFQBtenJZ4 MBSmu8jdCYng4LDy87PgG0Dm0= X-Received: by 2002:a17:902:ced0:b0:2ca:1b97:70c5 with SMTP id d9443c01a7336-2ccbe617d59mr15890325ad.4.1783360810922; Mon, 06 Jul 2026 11:00:10 -0700 (PDT) Received: from ustb520lab-MS-7E07.. ([115.25.44.221]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cad7893dadsm54829455ad.74.2026.07.06.11.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jul 2026 11:00:10 -0700 (PDT) From: Jiaming Zhang To: anprice@redhat.com Cc: agruenba@redhat.com, gfs2@lists.linux.dev, linux-kernel@vger.kernel.org, r772577952@gmail.com, stable@vger.kernel.org, syzkaller@googlegroups.com Subject: [PATCH v2] gfs2: reject oversized dinode sizes before i_size_write Date: Tue, 7 Jul 2026 02:00:03 +0800 Message-ID: <20260706180003.2124317-1-r772577952@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <74871a78-5243-4898-8e63-92e918912980@redhat.com> References: <74871a78-5243-4898-8e63-92e918912980@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- Changes in v2: - Drop the defensive unstuffing changes in bmap.c. fs/gfs2/glops.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 28f32424ee64..8c5d257451d5 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -393,11 +393,16 @@ 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_state_read_once(inode) & I_NEW; + u64 size = be64_to_cpu(str->di_size); if (unlikely(ip->i_no_addr != be64_to_cpu(str->di_num.no_addr))) { gfs2_consist_inode(ip); return -EIO; } + if (unlikely(size > (u64)inode->i_sb->s_maxbytes)) { + gfs2_consist_inode(ip); + return -EIO; + } if (unlikely(!is_new && inode_wrong_type(inode, mode))) { gfs2_consist_inode(ip); return -EIO; @@ -418,7 +423,7 @@ 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)); + 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); @@ -462,7 +467,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) return -EIO; } - 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.43.0