From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD8D91A00CE; Tue, 21 Oct 2025 20:06:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761077179; cv=none; b=B9tON7M+ySvlk8SfbLBCXUMT3/z8bC1A9LJmGWjkk4jQDvZiqkoJfuhhuvUWPKxTD73NqQCpXbeHDma8+9Cm8VxnmXStTgGmY6Kl1FmwcsXvjETPVmsJpG9QOm7niotgZoyoN9By78Uus8fYD4U3rT6SMlGlfv40duaV9SsabxQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761077179; c=relaxed/simple; bh=AFHORzg2cdrjsSf4WbTebHVKB6jPzj+AKqgB5Mmh588=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CYasbdBEtZ2g/bET0efrvVAgS1FZOUNF8tcewu5FF4jgAnPpBn4LYVLuab1tRKxqSsflEiGZP0L/SEsLGFizKkhkgQGxA7o7zqJfBPxHUC6caegJAaHu8uGJXkz0ip3YxQy5dQ7JO7kqIKzLz586scAX9s6jDUpjTI9DSzt/Bak= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=F7pG0REu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="F7pG0REu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C244C4CEF1; Tue, 21 Oct 2025 20:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761077179; bh=AFHORzg2cdrjsSf4WbTebHVKB6jPzj+AKqgB5Mmh588=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F7pG0REuLrjfGUSCzsYhT218NkaqsUC0L5f1Hs0PbdZBc60Q9S+5Uchl9Os9MAiNx Wzjd9rK6+2x95ZOq6TUyOjbvYUIlNM97tTB+MK9kJiyOQ0JahOVQQtJ77TFjuv44KU xzGSvMtVPCcvG4FI6WbpJH46MJ32VapPHhM5yZaQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Zhang Yi , Deepanshu Kartikey , Theodore Tso , syzbot+038b7bf43423e132b308@syzkaller.appspotmail.com Subject: [PATCH 6.17 024/159] ext4: detect invalid INLINE_DATA + EXTENTS flag combination Date: Tue, 21 Oct 2025 21:50:01 +0200 Message-ID: <20251021195043.770232072@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251021195043.182511864@linuxfoundation.org> References: <20251021195043.182511864@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Deepanshu Kartikey commit 1d3ad183943b38eec2acf72a0ae98e635dc8456b upstream. syzbot reported a BUG_ON in ext4_es_cache_extent() when opening a verity file on a corrupted ext4 filesystem mounted without a journal. The issue is that the filesystem has an inode with both the INLINE_DATA and EXTENTS flags set: EXT4-fs error (device loop0): ext4_cache_extents:545: inode #15: comm syz.0.17: corrupted extent tree: lblk 0 < prev 66 Investigation revealed that the inode has both flags set: DEBUG: inode 15 - flag=1, i_inline_off=164, has_inline=1, extents_flag=1 This is an invalid combination since an inode should have either: - INLINE_DATA: data stored directly in the inode - EXTENTS: data stored in extent-mapped blocks Having both flags causes ext4_has_inline_data() to return true, skipping extent tree validation in __ext4_iget(). The unvalidated out-of-order extents then trigger a BUG_ON in ext4_es_cache_extent() due to integer underflow when calculating hole sizes. Fix this by detecting this invalid flag combination early in ext4_iget() and rejecting the corrupted inode. Cc: stable@kernel.org Reported-and-tested-by: syzbot+038b7bf43423e132b308@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=038b7bf43423e132b308 Suggested-by: Zhang Yi Signed-off-by: Deepanshu Kartikey Reviewed-by: Zhang Yi Message-ID: <20250930112810.315095-1-kartikey406@gmail.com> Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5319,6 +5319,14 @@ struct inode *__ext4_iget(struct super_b } ei->i_flags = le32_to_cpu(raw_inode->i_flags); ext4_set_inode_flags(inode, true); + /* Detect invalid flag combination - can't have both inline data and extents */ + if (ext4_test_inode_flag(inode, EXT4_INODE_INLINE_DATA) && + ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) { + ext4_error_inode(inode, function, line, 0, + "inode has both inline data and extents flags"); + ret = -EFSCORRUPTED; + goto bad_inode; + } inode->i_blocks = ext4_inode_blocks(raw_inode, ei); ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo); if (ext4_has_feature_64bit(sb))