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 1B44A176AD7; Thu, 15 Aug 2024 14:19:19 +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=1723731559; cv=none; b=pwMenr57ip+jDl6tXy6hXb8jB7mt+PtYBfhvxyTn/DUiMW7zmrYrUcFVVZYA6Er/dBdUZ6CcuZ3rVm8HtV3OscZ1K8K+y1J4oIQ2JY2EwB75ocNon//ybAHsRipm7It6f+QQ9cOvqd5pfWkmz4XCpPFTC3ia2anLBOZrXJlABjA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723731559; c=relaxed/simple; bh=W8y9TxkMlyWU1I/wxyEcYTT+UA5xC9EM7t9e6EDZClM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LcjTXc4ByxFt44CBFfLhLZFxtd2WwbpLX+zw8pIF8RwO9qntn9fZvfT+voXeQFaLxMnVb6vD4MXjzjLJhlp+gKgcPhB2yGpsuqsHfEnoUzRjaUJwV8llPOqyDtHf6MR+gmIZqld46D8IsY3J1+iyws45S04wOe2URP0YYdfqKJ4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cn213Xvq; 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="cn213Xvq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96932C32786; Thu, 15 Aug 2024 14:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723731559; bh=W8y9TxkMlyWU1I/wxyEcYTT+UA5xC9EM7t9e6EDZClM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cn213XvqzoOIOIcksX41en6QgFVJPhIi6dsf4OE68Ubd4BZN9ftS+Z6cbLEHNYFrS +a4fTY4mNuzPSS8dx0hT7R0qNk0ojnd9hJ17evXQugrLtCLrbLO2e12xN/22GyesUI scHqZpiEqwNF2J5SNSDvGcHnhN20RHvoObtNptGY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+241c815bda521982cb49@syzkaller.appspotmail.com, Jeongjun Park , Dave Kleikamp , Sasha Levin Subject: [PATCH 5.4 136/259] jfs: Fix array-index-out-of-bounds in diFree Date: Thu, 15 Aug 2024 15:24:29 +0200 Message-ID: <20240815131908.045376675@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131902.779125794@linuxfoundation.org> References: <20240815131902.779125794@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.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeongjun Park [ Upstream commit f73f969b2eb39ad8056f6c7f3a295fa2f85e313a ] Reported-by: syzbot+241c815bda521982cb49@syzkaller.appspotmail.com Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jeongjun Park Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_imap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index b0965f3ef1865..36ed756820648 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c @@ -292,7 +292,7 @@ int diSync(struct inode *ipimap) int diRead(struct inode *ip) { struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); - int iagno, ino, extno, rc; + int iagno, ino, extno, rc, agno; struct inode *ipimap; struct dinode *dp; struct iag *iagp; @@ -341,8 +341,11 @@ int diRead(struct inode *ip) /* get the ag for the iag */ agstart = le64_to_cpu(iagp->agstart); + agno = BLKTOAG(agstart, JFS_SBI(ip->i_sb)); release_metapage(mp); + if (agno >= MAXAG || agno < 0) + return -EIO; rel_inode = (ino & (INOSPERPAGE - 1)); pageno = blkno >> sbi->l2nbperpage; -- 2.43.0