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 C0EE5258CEE; Thu, 3 Apr 2025 19:08:15 +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=1743707296; cv=none; b=AC2rPO/OMZ8R2/tjIspJ7H1QFPSI0MZNi7s/MshvYban1vG+TFg/uT+g412gkNdxULHxt+U6IhehR4TcFzmI/qs4UoQ8e9f8XOGteDKsDlqkEvJlnWBYSH3Hnv+V2FDGNjYlu4Eahjr0tW8WfMgZN5rgfierZGuFDXWuchFdL3c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707296; c=relaxed/simple; bh=DKtMNqkGSl3Jk+kOCm2sYF+Agp8jjR0lL5uamaFFRtQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X2dd15XCkd+PMcLb006FmrWJxgXVD8CZ6b3jaNq0WSXyB+IX+sExYfxs5uLAx8xkZeITL7SF0xtJYxsX7KR4x62HJGcDTyxw/0YWC5nwqfqAdI3TSVZlFx1V8MKZ3aDAHczF6HIiT0//FEK3lsWC3M3Ox4dE6oI0FFYl6mSsblY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Oa0OnqrX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Oa0OnqrX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA414C4CEE8; Thu, 3 Apr 2025 19:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743707295; bh=DKtMNqkGSl3Jk+kOCm2sYF+Agp8jjR0lL5uamaFFRtQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oa0OnqrXledPhDDH+3nE5O5bugtwr+Mb7i837WwfD0XA1L1anXPCaNEkRWaUJG5oZ tFi2bYQRm0O55JgrVejvvgNZjenigu6MSolhNP3GNJGueDoEqa8mfjsIrKtllJ7Tgp QI4LbawS1+Y1PlD86U+Gv5FMSNCduoMVyR2o+95KiiOHpAikRQ8QrJiGaHwnVeSIxC tJLb2PaoqUZegsnkJfEt6a7Oq2QbgEQjkO3gq7RCUe/k9xxsZYTTJHUPcJRhhgTRYy LnxUv2XMvIDPqz7YTSOeBeNH/MChzU611S/sm7lmKumiwIwrIWzj/eowsskO8kt+e8 EzEnCq/mp5urQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Edward Adam Davis , syzbot+7c808908291a569281a9@syzkaller.appspotmail.com, Dave Kleikamp , Sasha Levin , shaggy@kernel.org, rand.sec96@gmail.com, peili.dev@gmail.com, aha310510@gmail.com, ghanshyam1898@gmail.com, niharchaithanya@gmail.com, jfs-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 6.6 11/26] jfs: add sanity check for agwidth in dbMount Date: Thu, 3 Apr 2025 15:07:30 -0400 Message-Id: <20250403190745.2677620-11-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403190745.2677620-1-sashal@kernel.org> References: <20250403190745.2677620-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.85 Content-Transfer-Encoding: 8bit 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