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=1795061629; b=zU+QHj78bNzNQ55PnsHwQjyyVIUsDV63sH5Ok+l0XR93EDsTiahvUp1anGTshv55r02p Utdkm2uLEToZ7ad+EkqqgVmSNZmWa37CCZeE5Jf6vHdrzdlqQl7rldMCsriquc931FDs+ Cw9UhKIwlArlbYyENLpQjyerA0jD4vmXrpqIb8hyTyid+CVhMc2DfbbEfSGUldFuHCRiY Uci9y97JfooTcGUB4do7JHcK/PvsiW/6ghu3Wms3cOXjgjMZZd+BrJNJJEebPTlmQbo2k fR1gLzTt+2IkSEzuj3Xqi5Qf0Q9aaA4NYigVKKNmN+TBlUXV67cO8XpNmJhS337hhHA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795061629; 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=BcBzTAM8vjLbNdPMt82/ftta7LTL4TAu8gm/OAGexCk=; b=BPJYUAZpcRNxU16c7ptrvi7c2JQhLp9l7qReQweEh1d7cwpgAmr0Y+u5ziNss8mi+/6K 85dEkuT8wjiP9lA5zNUCQQOe8y6VpdXCFhJG8oQiww6ZHPvz0mVM3RqbXBotZImjZIrfq E49YbuVw9X1SJV9aVz683zmpMhgdigOcE27nLU6dmcN5jyf/uvE6EkB8oXc7ghlgcACC1 vD+cq+fbHXw1ZOLkko9cUxmxOKukfKSMblxDGFn1UBV8Q3xsZ/Zuy8t/dRJjIUJVEu7ha eLBtdp6MlfgDhfqplwy3JHhVrpDTLhc+NHpSaV4m4kDZyfZ0T271T2WfUkbYrePJqFQ== 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=YTSa9YTY; 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 21DD1606A325; Thu, 19 Nov 2026 04:13:49 +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=YTSa9YTY Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C72D1F000C4; Thu, 19 Nov 2026 04:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795061629; bh=BcBzTAM8vjLbNdPMt82/ftta7LTL4TAu8gm/OAGexCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YTSa9YTY+39IwwO9s4QZL5++9WxtMEyRSCwbMPtq20pulRaBxyQnPh8X4IkgagdB9 KfiFKRAeQwtwpj5FJzby040GDdwVxKSAtU38941oRjxuhwyP6uf0AFjT7nQ5yHK4Q5 cB66hKUSpr2iID5F+r/K167IrjpOBol5zw49SV4E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nguyen Ngoc Thang , Andrew Morton , syzbot+03aaa576f1daa1c1f2f0@syzkaller.appspotmail.com, Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Heming Zhao , Sasha Levin Subject: [PATCH 5.10 1621/1848] ocfs2: validate chunk and block counts of the local quota file Date: Wed, 18 Nov 2026 16:00:59 +0100 Message-ID: <20261118150027.429049494@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nguyen Ngoc Thang [ Upstream commit b10ef5d2c2083ea4c40e963c10a73a154793c5d4 ] ocfs2_local_read_info() trusts dqi_chunks and dqi_blocks from the local quota file header. If dqi_blocks is too small, ocfs2_extend_local_quota_file() computes a bogus chunk length, extends the file, and maps logical block dqi_blocks, which is already in the inode's metadata cache (the header or a chunk header read at mount). sb_getblk() returns that cached buffer and ocfs2_set_new_buffer_uptodate() hits BUG_ON(ocfs2_buffer_cached()): kernel BUG at fs/ocfs2/uptodate.c:509! ocfs2_extend_local_quota_file+0x45c/0x1100 ocfs2_create_local_dquot+0x8ac/0xb50 ocfs2_acquire_dquot+0x614/0xae0 ocfs2_get_init_inode+0xe9/0x1b0 ocfs2_mkdir+0x174/0x430 ocfs2_local_quota_add_chunk() has the same exposure. Reject a header whose counts don't fit the chunk layout or exceed i_size. Reproduced with a crafted image (dqi_blocks = 1, chunk 0 dqc_free = 0); syzbot has no reproducer for this report. Link: https://lore.kernel.org/20260920140710.43938-1-ngocthang2710.1999@gmail.com Fixes: 9e33d69f553a ("ocfs2: Implementation of local and global quota file handling") Signed-off-by: Nguyen Ngoc Thang Signed-off-by: Andrew Morton Reported-by: syzbot+03aaa576f1daa1c1f2f0@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=03aaa576f1daa1c1f2f0 Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Heming Zhao Signed-off-by: Sasha Levin --- fs/ocfs2/quota_local.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index a49f5d3fb378a..1f0439fec6240 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c @@ -245,6 +245,25 @@ static void ocfs2_release_local_quota_bitmaps(struct list_head *head) } } +/* Check that the on-disk chunk and block counts match the file layout */ +static int ocfs2_check_local_quota_info(struct inode *inode, + unsigned int chunks, + unsigned int blocks) +{ + u64 chunk_len = ol_chunk_blocks(inode->i_sb) + 1; + u64 min_blocks = chunks ? 1 + chunk_len * (chunks - 1) + 1 : 1; + u64 max_blocks = 1 + chunk_len * chunks; + + if (blocks >= min_blocks && blocks <= max_blocks && + blocks <= i_size_read(inode) >> inode->i_sb->s_blocksize_bits) + return 0; + + return ocfs2_error(inode->i_sb, + "Quota file %llu has bad info: %u chunks, %u blocks\n", + (unsigned long long)OCFS2_I(inode)->ip_blkno, + chunks, blocks); +} + /* Load quota bitmaps into memory */ static int ocfs2_load_local_quota_bitmaps(struct inode *inode, struct ocfs2_local_disk_dqinfo *ldinfo, @@ -730,6 +749,11 @@ static int ocfs2_local_read_info(struct super_block *sb, int type) oinfo->dqi_blocks = le32_to_cpu(ldinfo->dqi_blocks); oinfo->dqi_libh = bh; + status = ocfs2_check_local_quota_info(lqinode, oinfo->dqi_chunks, + oinfo->dqi_blocks); + if (status < 0) + goto out_err; + /* We crashed when using local quota file? */ if (!(oinfo->dqi_flags & OLQF_CLEAN)) { rec = OCFS2_SB(sb)->quota_rec; -- 2.53.0