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 E8FACC3DA6E for ; Sat, 17 Dec 2022 15:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231268AbiLQPkR (ORCPT ); Sat, 17 Dec 2022 10:40:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231186AbiLQPia (ORCPT ); Sat, 17 Dec 2022 10:38:30 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE58F25DB; Sat, 17 Dec 2022 07:30:47 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C395460C01; Sat, 17 Dec 2022 15:30:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44751C433EF; Sat, 17 Dec 2022 15:30:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671291040; bh=ekaNhfdppCHtWyCxuz2IMweIRM+SE/hGj17+uDFVQx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JEJK9E0LPIts/jPbDZCNY5DqbiNr6mFFNq2oYVTflDnxxd2+Q1Gm59L+ndYFhV6bQ Si3k3uJwi4jcscTvJTmZH3bbVERTgnYo3QuXRaToleVyU42T3zwJPVLHrZqzmzURLt NLpPpvUuNRhPYaHR/rxDRNZ03AZlZ41Y1rBBSqpD/rpn5t7pHWQLA6dwvca3xZv+8I Wji22+VU44vfKckr4vqv7noF89wmgJKhipjjTZBa7mVdT+bf0R+Q/KdIFqIGCvR1L3 ixTDUx20hoT+9e92ue3/OV0w+6hxedY3IEZPHIjXvTSQ7GyJSnM+L5qFNM7TYfDhZV MhphOSpxSlxXg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hoi Pok Wu , Dave Kleikamp , Sasha Levin , shaggy@kernel.org, mudongliangabcd@gmail.com, paskripkin@gmail.com, r33s3n6@gmail.com, jfs-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 4.14 3/8] fs: jfs: fix shift-out-of-bounds in dbDiscardAG Date: Sat, 17 Dec 2022 10:30:26 -0500 Message-Id: <20221217153033.99394-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217153033.99394-1-sashal@kernel.org> References: <20221217153033.99394-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hoi Pok Wu [ Upstream commit 25e70c6162f207828dd405b432d8f2a98dbf7082 ] This should be applied to most URSAN bugs found recently by syzbot, by guarding the dbMount. As syzbot feeding rubbish into the bmap descriptor. Signed-off-by: Hoi Pok Wu Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dmap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index a46fa0f3db57..0ca1ad2610df 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c @@ -211,6 +211,11 @@ int dbMount(struct inode *ipbmap) goto err_release_metapage; } + if (((bmp->db_mapsize - 1) >> bmp->db_agl2size) > MAXAG) { + err = -EINVAL; + goto err_release_metapage; + } + for (i = 0; i < MAXAG; i++) bmp->db_agfree[i] = le64_to_cpu(dbmp_le->dn_agfree[i]); bmp->db_agsize = le64_to_cpu(dbmp_le->dn_agsize); -- 2.35.1