From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65B99C4167D for ; Tue, 7 Nov 2023 15:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344165AbjKGPsQ (ORCPT ); Tue, 7 Nov 2023 10:48:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344167AbjKGPry (ORCPT ); Tue, 7 Nov 2023 10:47:54 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B170F9E; Tue, 7 Nov 2023 07:47:33 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41ACBC433C8; Tue, 7 Nov 2023 15:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699372053; bh=OucGIFr0w4JUXaiM6Vxa0r6YJGlAEh3PGmAtGGjQMFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eK90Q8mNJ5ksqX36zB3B+NorhT9t8TmM4XjhhSwYiXQmbTDA9jj69SqnE9qN38X3M hn83xy4iyzpba4T61U4tk0vHVCBsqYvWMMcaXzqwH6sVHcfl2LdAYgKfqJ/BX94Oj6 InIaRp0DqCIJEHjn93G2eXo9lTh9gsa+yZQswaX6X9c/kh+U3lLpQAdphEgp+6Cf9a xDZJPRuN93hpXofURRowyt9tFPkOCOfhf8ojGB00d2cOFlEWvnAfHLU6toKd7HW13M WYNtceZE8cTeKOxSGA7reTqRkZPBlpJcHcCHjDBaB02KtT8jN+82/oLMlVNM5eGlJI BY1e9hqb+k8ZA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Manas Ghandat , syzbot+79d792676d8ac050949f@syzkaller.appspotmail.com, Dave Kleikamp , Sasha Levin , shaggy@kernel.org, jlayton@kernel.org, brauner@kernel.org, okanatov@gmail.com, jfs-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 6.6 15/36] jfs: fix array-index-out-of-bounds in diAlloc Date: Tue, 7 Nov 2023 10:45:57 -0500 Message-ID: <20231107154654.3765336-15-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107154654.3765336-1-sashal@kernel.org> References: <20231107154654.3765336-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Manas Ghandat [ Upstream commit 05d9ea1ceb62a55af6727a69269a4fd310edf483 ] Currently there is not check against the agno of the iag while allocating new inodes to avoid fragmentation problem. Added the check which is required. Reported-by: syzbot+79d792676d8ac050949f@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=79d792676d8ac050949f Signed-off-by: Manas Ghandat 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 923a58422c461..1b267eec3f367 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c @@ -1320,7 +1320,7 @@ diInitInode(struct inode *ip, int iagno, int ino, int extno, struct iag * iagp) int diAlloc(struct inode *pip, bool dir, struct inode *ip) { int rc, ino, iagno, addext, extno, bitno, sword; - int nwords, rem, i, agno; + int nwords, rem, i, agno, dn_numag; u32 mask, inosmap, extsmap; struct inode *ipimap; struct metapage *mp; @@ -1356,6 +1356,9 @@ int diAlloc(struct inode *pip, bool dir, struct inode *ip) /* get the ag number of this iag */ agno = BLKTOAG(JFS_IP(pip)->agstart, JFS_SBI(pip->i_sb)); + dn_numag = JFS_SBI(pip->i_sb)->bmap->db_numag; + if (agno < 0 || agno > dn_numag) + return -EIO; if (atomic_read(&JFS_SBI(pip->i_sb)->bmap->db_active[agno])) { /* -- 2.42.0