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 0A1F27262F for ; Mon, 13 Apr 2026 15:43:48 +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=1776095029; cv=none; b=ifH6DTLJ3v8erJ13Vau4yIs8QIBayeX9co02rU4U8h/h/W/8Os+h/nyYcSkuhsWzlJA5m4ZUxkWSXG6YRpPMyDnxyL6AxK42aYvEJuUz3UBfKLiZOH6hCDJ+4DO2EJ6s9BVMziVHkGi+sx2b7a3p+IUWqQ4CJ3vuNBBv2o6s7sY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776095029; c=relaxed/simple; bh=M0bVPkrbbIhDenLowMcleSfAmGwfFjbyg+hGjP2nJ60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kl5FkstH1I1EvElIjyHyIRBaYxWsyCBgZ7thfQNhzy6Tf2inG0POFneNZ8GW+ckPiP9qXS2xykE6pzvkAWOqrgG8p3jAaZdEHZE1XrHPacpy4mjgGS9LigOBRhCdm14TqDrgtmDjMtthTZzg9+xNaFCR448j7bk7lk/h0hSdQ5g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Gasi3Ut/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Gasi3Ut/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DA28C2BCAF; Mon, 13 Apr 2026 15:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776095028; bh=M0bVPkrbbIhDenLowMcleSfAmGwfFjbyg+hGjP2nJ60=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gasi3Ut/7xrwwnnks3gcIvOGXKkwWKOaZP++Q+AL+3IzvTwHdch/96/BK9w/d9Jr2 EAWzw0aryir2Ogdqn4D07xn+7nNTtMQY6SluFOozxwpp9nZ/r0bKvfnqkkD3E123Fl h5R6RFtXrplDpIPcHrh/F1D1G6J7SIu6HuzRYQzAQTgUCCT437CwwoB2EkCuMCBuzB yVbmoOKO4hRj4TgPXXe89RCyVl1p2maj0zQKIsN1m0R20hYt/B6gOSLiKTaL42JksF B4yraBJBUzfm2+hCYhsqEJm9MVrbSkJcb+xTd2rRt/MzqQ5xkzf3+pS1gQEnNGOKhE IbX9fr9ojWIgg== From: Sasha Levin To: stable@vger.kernel.org Cc: Dmitry Antipov , syzbot+c16daba279a1161acfb0@syzkaller.appspotmail.com, Joseph Qi , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Changwei Ge , Jun Piao , Heming Zhao , Andrew Morton , Sasha Levin Subject: [PATCH 6.1.y 1/3] ocfs2: add inline inode consistency check to ocfs2_validate_inode_block() Date: Mon, 13 Apr 2026 11:43:43 -0400 Message-ID: <20260413154345.3124558-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026041352-oppressor-guidable-7094@gregkh> References: <2026041352-oppressor-guidable-7094@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Dmitry Antipov [ Upstream commit a2b1c419ff72ec62ff5831684e30cd1d4f0b09ee ] In 'ocfs2_validate_inode_block()', add an extra check whether an inode with inline data (i.e. self-contained) has no clusters, thus preventing an invalid inode from being passed to 'ocfs2_evict_inode()' and below. Link: https://lkml.kernel.org/r/20251023141650.417129-1-dmantipov@yandex.ru Signed-off-by: Dmitry Antipov Reported-by: syzbot+c16daba279a1161acfb0@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=c16daba279a1161acfb0 Reviewed-by: Joseph Qi Cc: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Changwei Ge Cc: Jun Piao Cc: Heming Zhao Signed-off-by: Andrew Morton Stable-dep-of: 7bc5da4842be ("ocfs2: fix out-of-bounds write in ocfs2_write_end_inline") Signed-off-by: Sasha Levin --- fs/ocfs2/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c index a1f3b25ce612b..7115d2091cb92 100644 --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -1419,6 +1419,14 @@ int ocfs2_validate_inode_block(struct super_block *sb, goto bail; } + if ((le16_to_cpu(di->i_dyn_features) & OCFS2_INLINE_DATA_FL) && + le32_to_cpu(di->i_clusters)) { + rc = ocfs2_error(sb, "Invalid dinode %llu: %u clusters\n", + (unsigned long long)bh->b_blocknr, + le32_to_cpu(di->i_clusters)); + goto bail; + } + rc = 0; bail: -- 2.53.0