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 510F62054F8; Thu, 12 Dec 2024 15:23:55 +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=1734017035; cv=none; b=C1Sm0grz88/ZP2WFk9tIxELpK+7KKY97EpVHCPSFHT+YRZPfG1BPJL/U796aNyyDHKe9h2HCCh+9gc8Lrbl9/1kXTxSGre+YD6dQdGlsMOpVwTruQ0Ho/zy8DEKtBst3r+hawoCuY2gGHfvpj0lHL76aChATAor+O27ggf305QA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734017035; c=relaxed/simple; bh=0UK1F1ZTUh/fmCrD3DDvZcCDrYby2TmTej6EpymLeas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DtVO0qb7Hs7dt8y44Mwt0fjSkT55emP3GykN7iSGfE5M2bI8VPyt73qq4qxCqhUBKFXvi2X+fUObS56Y/eqfktXe+P7aVGhrZ37DZ3R8HhYuEd36k5Brwe0C9UwuAI5dQhAdpOXW3cMmZKsWgQORVMp9TVzq2LM/5iTpThOa9TA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TZ4FLiqx; 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="TZ4FLiqx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B077AC4CECE; Thu, 12 Dec 2024 15:23:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734017035; bh=0UK1F1ZTUh/fmCrD3DDvZcCDrYby2TmTej6EpymLeas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TZ4FLiqxsJZcnZ+ljPxomQYTxa2dmczHEmzW1QfY37f/Sbj4g3cczaIjx+RTB129K xkCSYfy4QrV9Q+R8OMPR+mpnTK5RM6EkZeNvEnR6I9Rby1UhJuubBXcoXyGAhVg+my 8q+4bLgOYHxYavAUynmSg9B1FnWpDOHVCTEAZnSA= 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 6.12 322/466] jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree Date: Thu, 12 Dec 2024 15:58:11 +0100 Message-ID: <20241212144319.517744145@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144306.641051666@linuxfoundation.org> References: <20241212144306.641051666@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 6.12-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 39957361a7eed..f9009e4f9ffd8 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -2891,6 +2891,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