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 32BBE17B421; Wed, 23 Apr 2025 15:00:48 +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=1745420448; cv=none; b=odrY5RepCmcs3choRhJeVefSbFIEPdw47Po84iSOaa8mD1oHLeaMhOYz9NZ7PsHateBk78KF6923cHkvtToe9n4+LIFrQp8Z9TZtZPiE6fC2n6OXWUR69jfFwUuh6UxEWYjPmmfIW7q8yYbFm+NlGfO/7BzZfHoOhuuQP6T+euw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420448; c=relaxed/simple; bh=E8AvPaZ/7QPQkllcwERMhVetYumi/PwMi7T/gEsQTe8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AAD/jdsl6ceY6FQTLXZxkOSemp9QPoqxjoh3MHWG1i+nzbObUE0rNg9CcX822rcJHMRF3RerMo3JS0Gq+M+ntWWnYPOW1h9Eqp9TvbQE5N/kMCxwxumxz/qFLovWEVWenYL2BWB3owdCBPNrbGWcXwFr1ctsA9t0vS18llNwwXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dUBcC6D3; 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="dUBcC6D3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B678AC4CEE2; Wed, 23 Apr 2025 15:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745420448; bh=E8AvPaZ/7QPQkllcwERMhVetYumi/PwMi7T/gEsQTe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dUBcC6D3k1SL0rwMBdZde61nuVUVHjS08ybTqg4/mFOZdraJEM3rvE0sLEW86VgF/ qVDmO2PmO4vZWb83UwXWAURqTmqcKnAimtedmH6kwpDbDXrxGqSFFIYNHyFDb/yU1k ZbizGKnv6RzUH/ozx18O0UCP2jq93AycJAFMsBe0= 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.6 075/393] jfs: add sanity check for agwidth in dbMount Date: Wed, 23 Apr 2025 16:39:31 +0200 Message-ID: <20250423142646.404969772@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 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 6.6-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