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 05CCA1F680F; Sun, 24 Nov 2024 13:48:17 +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=1732456097; cv=none; b=pEv1FM6MrK0R1+pEHclgyjKYPuArIwYOfivvf8QC/jD02U+T0t1aOZYHh0uMGPDbYz5WE8F4PeUz9VQ1qXhjclEXr4KqDnAgaKiyROQDVBuT/3iXxsTUJ2XMy5kRaNsS1W/hbj/SZEwPuYO9Qs8Ie1k6d1tt3N/6opugFmkjEro= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456097; c=relaxed/simple; bh=GPWL1EoADPh4U369AvLTJZQRfBf1SjUW476Qa27QLl8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hyaTO4HpbryrMUjcDuEWhri9PSn8e0W8Aag96UbK00k7KRESNdz/2/raC/Ml8xJXDoOhFAy24hQ1UbelyOLQgkquy0L+2gtiNM2PsI9vwitpEjmKoWHdW0poP7FyhPpP3bXL7lPFsgMINpvxzFcFzhGktn9D6lpf+QBgLrEyhUU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UyNZpGXk; 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="UyNZpGXk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE3D9C4CECC; Sun, 24 Nov 2024 13:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732456096; bh=GPWL1EoADPh4U369AvLTJZQRfBf1SjUW476Qa27QLl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UyNZpGXkWgjUtRKRUP/lS4sopv/6tfvrAcJvVDZnryFNxnL3aJ5d8tfU+zDGcn/qK NYPpm6h3HFqpd2iOFqa4b6UpIseQjBzEsOOziPkBwiJV63nI4SKKC99ctUHLGXG0br 0WcdqcJWRMHIm1tkpEAsMU7OIxBJzk/69Qqb7GGZ4BOLHzlIVsLwPw5M9Xipki66E3 R9AVsSRtp+164AKMNtYz6LoMyrDEKi306f4CujwVqSljfZ5Xefzzj9iTIpWR6y1igt p+LmfRYjzAWa8T5X5rBzGUCDGVqaiSTjWG3+VgtrScQ6nO+zyv804xMnPA2cPaeoeL DGkn3O18uTdVw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ghanshyam Agrawal , syzbot+0315f8fe99120601ba88@syzkaller.appspotmail.com, Dave Kleikamp , Sasha Levin , shaggy@kernel.org, eadavis@qq.com, jfs-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 6.6 40/61] jfs: fix array-index-out-of-bounds in jfs_readdir Date: Sun, 24 Nov 2024 08:45:15 -0500 Message-ID: <20241124134637.3346391-40-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124134637.3346391-1-sashal@kernel.org> References: <20241124134637.3346391-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.63 Content-Transfer-Encoding: 8bit From: Ghanshyam Agrawal [ Upstream commit 839f102efb168f02dfdd46717b7c6dddb26b015e ] The stbl might contain some invalid values. Added a check to return error code in that case. Reported-by: syzbot+0315f8fe99120601ba88@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=0315f8fe99120601ba88 Signed-off-by: Ghanshyam Agrawal Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dtree.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c index 69fd936fbdb37..8f85177f284b5 100644 --- a/fs/jfs/jfs_dtree.c +++ b/fs/jfs/jfs_dtree.c @@ -2891,6 +2891,14 @@ int jfs_readdir(struct file *file, struct dir_context *ctx) stbl = DT_GETSTBL(p); for (i = index; i < p->header.nextindex; i++) { + if (stbl[i] < 0 || stbl[i] > 127) { + jfs_err("JFS: Invalid stbl[%d] = %d for inode %ld, block = %lld", + i, stbl[i], (long)ip->i_ino, (long long)bn); + free_page(dirent_buf); + DT_PUTPAGE(mp); + return -EIO; + } + d = (struct ldtentry *) & p->slot[stbl[i]]; if (((long) jfs_dirent + d->namlen + 1) > -- 2.43.0