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 311DB2153EC; Thu, 12 Dec 2024 17:32:58 +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=1734024778; cv=none; b=iuBuHP+ZSGuUy2ov71js1ovrwhhkVEJN0/MBd90iuysKEiNiW5QdS40W5PLj6t71QQJQbe8496sLNINI7/q7rlKhS9TFOQ54TRTujYSuojKhqpwEqYLBl0Nj24Up+hnWtz/idRATPhK580aI/RhTcOWYritTcuN5kUVgmDrxDjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734024778; c=relaxed/simple; bh=9sDrmI/02x1zisZCOAWX3wZBZu5pO/00Wn0TpO1EM2Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lbRluxOnquBK4Iv1g4ABIHrAScXjeLZaKMd9CQ/6+IR5ChNKeYAmc0MZ8HwwDPRnWypVs6Q4W0jWaAN0zUEUTeOfTYvhvm8+5Mk4nPBnBEeW7ZsJsF18Ex9UltoD/2w41iApZ3wJUrNGzOP6Zdz2gCVQPdJcsvc89G8f9KcSaUg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BrOxyKMu; 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="BrOxyKMu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3728C4CECE; Thu, 12 Dec 2024 17:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734024778; bh=9sDrmI/02x1zisZCOAWX3wZBZu5pO/00Wn0TpO1EM2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BrOxyKMu7XuoBuPDEVqAYOnMc8/useQ3TDift6Uy5gY7I2oJnNX2YGX8ozzy3crR7 4lbtDsGRuG6bzcXv///jssuRM+wVBuOLiyHPxdK9nYQKyl3PS0MKsc/CEzBo+tbcfc jJxi0L2QwTiAympeWOPf26ketTiLEyOV4bXUxhPA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+412dea214d8baa3f7483@syzkaller.appspotmail.com, Nihar Chaithanya , Dave Kleikamp , Sasha Levin Subject: [PATCH 5.10 407/459] jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree Date: Thu, 12 Dec 2024 16:02:25 +0100 Message-ID: <20241212144309.843666779@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144253.511169641@linuxfoundation.org> References: <20241212144253.511169641@linuxfoundation.org> User-Agent: quilt/0.67 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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nihar Chaithanya [ Upstream commit a174706ba4dad895c40b1d2277bade16dfacdcd9 ] When the value of lp is 0 at the beginning of the for loop, it will become negative in the next assignment and we should bail out. Reported-by: syzbot+412dea214d8baa3f7483@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=412dea214d8baa3f7483 Tested-by: syzbot+412dea214d8baa3f7483@syzkaller.appspotmail.com Signed-off-by: Nihar Chaithanya Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index c61fcf0e88d29..ef220709c7f51 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -2953,6 +2953,9 @@ static void dbAdjTree(dmtree_t *tp, int leafno, int newval, bool is_ctl) /* bubble the new value up the tree as required. */ for (k = 0; k < le32_to_cpu(tp->dmt_height); k++) { + if (lp == 0) + break; + /* get the index of the first leaf of the 4 leaf * group containing the specified leaf (leafno). */ -- 2.43.0