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 B6366258CE1; Thu, 17 Apr 2025 17:59:26 +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=1744912766; cv=none; b=Gh2mTCSsx0sFZIa/HzQbb5lz382PD87C7Y33TFgD2A+8PIPBtFiD74B4KLkI+l+xyY3kBqZYizaDLSaR6cqLFiEIVMN94r9d5jxoV+wuCRCOrZj7V0mzDb3n1lxFI+dL0iZUKHmEKDrDrAfX3Bp0d9OH55q9rEJSxlUWq3ND5CM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744912766; c=relaxed/simple; bh=V1bCqehzvCtIthtth8y+IcYetapRu+2COgsKq6SrQsk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O2zoJk74kRkVDLJ8HKeryS7Dhj+Ym6VXFgEvnTPVWlaMsJSgfGQ12eNKkcRQur8bfDoDn2lZtTamFUXmfuBThNuqCiy6aqODAh/RvxivglG3/OwPTfbavj8kjjd3UB7n2ndgqfQpRCutGXwHLLUJW3XuFlFlM5MJYB9VHsLLQks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gtez/pe1; 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="gtez/pe1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9552C4CEE4; Thu, 17 Apr 2025 17:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744912766; bh=V1bCqehzvCtIthtth8y+IcYetapRu+2COgsKq6SrQsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gtez/pe1diNtHA7VorYqS29Hg1SaB1fG6yei9Tdg+R8pL/5vmEtXVavEHUUw7ozsi Z6aaQAtlanEYeDd4aYVjce+ZUBzPmHY7A83eXYnqdpr2tzJUUQ724G0tQ+p9ypzg3a vuluuOhMNtQiwQsQItDNfbY0q2vTBQhJq1+UT9PA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Edward Adam Davis , Dave Kleikamp , Sasha Levin , syzbot+7c808908291a569281a9@syzkaller.appspotmail.com Subject: [PATCH 6.14 117/449] jfs: add sanity check for agwidth in dbMount Date: Thu, 17 Apr 2025 19:46:45 +0200 Message-ID: <20250417175122.679505609@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Edward Adam Davis [ Upstream commit ddf2846f22e8575d6b4b6a66f2100f168b8cd73d ] The width in dmapctl of the AG is zero, it trigger a divide error when calculating the control page level in dbAllocAG. To avoid this issue, add a check for agwidth in dbAllocAG. Reported-and-tested-by: syzbot+7c808908291a569281a9@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=7c808908291a569281a9 Signed-off-by: Edward Adam Davis Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index 9ac1fc2ed05bc..0e1019382cf51 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -204,6 +204,10 @@ int dbMount(struct inode *ipbmap) bmp->db_aglevel = le32_to_cpu(dbmp_le->dn_aglevel); bmp->db_agheight = le32_to_cpu(dbmp_le->dn_agheight); bmp->db_agwidth = le32_to_cpu(dbmp_le->dn_agwidth); + if (!bmp->db_agwidth) { + err = -EINVAL; + goto err_release_metapage; + } bmp->db_agstart = le32_to_cpu(dbmp_le->dn_agstart); bmp->db_agl2size = le32_to_cpu(dbmp_le->dn_agl2size); if (bmp->db_agl2size > L2MAXL2SIZE - L2MAXAG || -- 2.39.5