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 C5FAE33E347; Fri, 24 Apr 2026 13:39:25 +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=1777037965; cv=none; b=HTV8QBnHZdbeP7a1hz1LGOT0Oox160NAgPQq7CsWMwtfp9Z10ZcqesqalZGDK228Owe1o1wrdfZCgkxgnlz28oefOuGrpU+8i7QnKfPJu4pASJUbuD7A1T9WV4844g0wC5X0rR/1iHaXZvo9Nrqd4u6Vt8rAYKivJj9gQ23jEIE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777037965; c=relaxed/simple; bh=+fZXSf61b/ibk7IXSZFzH4TXKjDqysu1asie87O74Vc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zlwd9Q/qYqkzVpgg8Tywjd73N105nfodEwjVbTCtJxO/p3EHlTeUMeBz/ZKTV7t25MwfFLKX6DPfk52y613mDX3g7VCB5NKHgtE0YgEg5djD5xEJOkxD8/UNOv1bR676jt2ZaDygMlEX+QDhjsy/iwFlT1qpfyZuQyYT43DlWOY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=U2/sXGHi; 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="U2/sXGHi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2CA6C19425; Fri, 24 Apr 2026 13:39:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777037965; bh=+fZXSf61b/ibk7IXSZFzH4TXKjDqysu1asie87O74Vc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2/sXGHiQMyonVHpL5vcGcoOIInEoQUTqD5IS8ESnwZ9knyb0ErXmYd38YQ9Y/LjX WSh/rZk5oUA9f6UtjIR9TIopQFc8RLDD1CflbTHze7Dniw2UuZMzIxjceAb+MxtDZb 5hxPkaRvvnbb5Mal5hvVZ9WP0buSa9ecUCEjjzq0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, 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.6 138/166] ocfs2: add inline inode consistency check to ocfs2_validate_inode_block() Date: Fri, 24 Apr 2026 15:30:52 +0200 Message-ID: <20260424132601.863969254@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424132532.812258529@linuxfoundation.org> References: <20260424132532.812258529@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/inode.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/fs/ocfs2/inode.c +++ b/fs/ocfs2/inode.c @@ -1419,6 +1419,14 @@ int ocfs2_validate_inode_block(struct su 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: