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 7D2ED18A6C4; Tue, 26 Aug 2025 13:24:14 +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=1756214654; cv=none; b=KxRsEjWg7EiRrQIQmbAHFKVmlY7vHXcxf3tzkILav5nmnyg5Q5E7LaPGmy4cEVbCfXUf9s1MkUb+sXy6S/xHQSzKcr9eyyG5TK/4d6KFLYyLTPyhoCfoOyzxNPZ05VzJu4O4xDnaulA5v4BAnCtJPeUcyohgxBUv2wSaNTDQexY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214654; c=relaxed/simple; bh=Do+FZolT192o6duMrs03mzknZYkUD7FCZUuj470wM/w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ra8bDFH62tPJtO9isgyWzlTh3DeXRNHHq4pGxpnKnp/qKq7Ee39gCLcabCGuE0aBX6UajiaHQoc6jE0wIfJ0Gmr4hCbY5uxZ3yGcRWBUWndqH3k3iqqqjKDS3xMaaRTc10mc26K/AIVtMgIifWQZzGdc8nbB2cHNUHgwKSQs/W0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MOFIqG68; 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="MOFIqG68" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EE44C4CEF1; Tue, 26 Aug 2025 13:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756214654; bh=Do+FZolT192o6duMrs03mzknZYkUD7FCZUuj470wM/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MOFIqG68+z4ivLwWMJpQVxEW/x/Dp8fdoZsvF6SqsOFwXgbhU4jpeKLQdIYRi5wGS WwnBj6cQ+/NuovJDoxu5ms1tSWoHScwDCW8ty4r/G5H3wr2Ycq+ixI7I6/JAXXOtRB VBkmvM+md2T6e/ObewY9nzYoQ6TeLmc3LERn8PzU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+cffd18309153948f3c3e@syzkaller.appspotmail.com, Arnaud Lecomte , Dave Kleikamp , Sasha Levin Subject: [PATCH 6.1 188/482] jfs: upper bound check of tree index in dbAllocAG Date: Tue, 26 Aug 2025 13:07:21 +0200 Message-ID: <20250826110935.450017614@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaud Lecomte [ Upstream commit c214006856ff52a8ff17ed8da52d50601d54f9ce ] When computing the tree index in dbAllocAG, we never check if we are out of bounds realative to the size of the stree. This could happen in a scenario where the filesystem metadata are corrupted. Reported-by: syzbot+cffd18309153948f3c3e@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=cffd18309153948f3c3e Tested-by: syzbot+cffd18309153948f3c3e@syzkaller.appspotmail.com Signed-off-by: Arnaud Lecomte Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dmap.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index c761291f59ac..277f3175477f 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -1389,6 +1389,12 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) (1 << (L2LPERCTL - (bmp->db_agheight << 1))) / bmp->db_agwidth; ti = bmp->db_agstart + bmp->db_agwidth * (agno & (agperlev - 1)); + if (ti < 0 || ti >= le32_to_cpu(dcp->nleafs)) { + jfs_error(bmp->db_ipbmap->i_sb, "Corrupt dmapctl page\n"); + release_metapage(mp); + return -EIO; + } + /* dmap control page trees fan-out by 4 and a single allocation * group may be described by 1 or 2 subtrees within the ag level * dmap control page, depending upon the ag size. examine the ag's -- 2.39.5