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 E4D6A14C5AE; Thu, 1 Aug 2024 00:17:05 +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=1722471426; cv=none; b=AR7i7qJMTicFbU40JzKN+eFmiLkgyNcYxSjeHhZZHqQoTJNVytedmyrge4uNtW3gp0JikhzqeUCR1MaZy3tvNjtJNRN1OiczSprs3bUIjBkP2X0uS1+siG/wbWsVciE/MJ6a9B8vrh5SyoTD/KnvEoxLPi8tyQUqDsRUnGCc7us= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722471426; c=relaxed/simple; bh=Yl9B4bekSsZJl1S5dXDTfmH5Qepr+jC/AtijGyvIzNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JIgGVScNZVslWlpFcH9lgkTCWTi7wnNRaFsb93CCi5hCDsoqIocC5RoD0Gq+m5fA4Vuq1JcGoQxq3xj6H2hBOFXPQ107zjxmlL33DPNuvy0ob5iDlVhjtg0cjsaVkcaZCm/JUlUyIMiu3Ac43e2SyYa/HJOCTI7PScSIlAa13dw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RX4+BPtb; 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="RX4+BPtb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B485CC4AF0F; Thu, 1 Aug 2024 00:17:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722471425; bh=Yl9B4bekSsZJl1S5dXDTfmH5Qepr+jC/AtijGyvIzNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RX4+BPtb29ks/QznazfD587TUnz/EK9brhC+0RBVTW9NhvcOW7FbJJEb2AIWeCzLw 4dIoCVljxP+1NxaHu372/8WXrNOG8NiU8JHxY0WDT2gIar72Xw3CMH4r+9RuBv5v2D /V8IYkaomdIGMfpV07e6+qUtfIWDcF4096gtuxqUfmWkY0lncGaUOSa5+lYZDi/u8c 9z7V/m2yM48FO53ZqouvGdjPJluulujg0m1A5MlfDhFjhsRPSfDNiACaT0iR0iqpAa GW+ey7T1QEoJLiqEiqY4hUBmS1m8Wxq3uqyDa86AYCWzCokcnXxHrP7Ky9ri7TsF8n C3tNayhCUatVQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan Kara , Sasha Levin , jack@suse.com Subject: [PATCH AUTOSEL 6.10 094/121] udf: Avoid excessive partition lengths Date: Wed, 31 Jul 2024 20:00:32 -0400 Message-ID: <20240801000834.3930818-94-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801000834.3930818-1-sashal@kernel.org> References: <20240801000834.3930818-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.10.2 Content-Transfer-Encoding: 8bit From: Jan Kara [ Upstream commit ebbe26fd54a9621994bc16b14f2ba8f84c089693 ] Avoid mounting filesystems where the partition would overflow the 32-bits used for block number. Also refuse to mount filesystems where the partition length is so large we cannot safely index bits in a block bitmap. Link: https://patch.msgid.link/20240620130403.14731-1-jack@suse.cz Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/udf/super.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/fs/udf/super.c b/fs/udf/super.c index 9381a66c6ce58..8411db883cbce 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1110,12 +1110,19 @@ static int udf_fill_partdesc_info(struct super_block *sb, struct udf_part_map *map; struct udf_sb_info *sbi = UDF_SB(sb); struct partitionHeaderDesc *phd; + u32 sum; int err; map = &sbi->s_partmaps[p_index]; map->s_partition_len = le32_to_cpu(p->partitionLength); /* blocks */ map->s_partition_root = le32_to_cpu(p->partitionStartingLocation); + if (check_add_overflow(map->s_partition_root, map->s_partition_len, + &sum)) { + udf_err(sb, "Partition %d has invalid location %u + %u\n", + p_index, map->s_partition_root, map->s_partition_len); + return -EFSCORRUPTED; + } if (p->accessType == cpu_to_le32(PD_ACCESS_TYPE_READ_ONLY)) map->s_partition_flags |= UDF_PART_FLAG_READ_ONLY; @@ -1171,6 +1178,14 @@ static int udf_fill_partdesc_info(struct super_block *sb, bitmap->s_extPosition = le32_to_cpu( phd->unallocSpaceBitmap.extPosition); map->s_partition_flags |= UDF_PART_FLAG_UNALLOC_BITMAP; + /* Check whether math over bitmap won't overflow. */ + if (check_add_overflow(map->s_partition_len, + sizeof(struct spaceBitmapDesc) << 3, + &sum)) { + udf_err(sb, "Partition %d is too long (%u)\n", p_index, + map->s_partition_len); + return -EFSCORRUPTED; + } udf_debug("unallocSpaceBitmap (part %d) @ %u\n", p_index, bitmap->s_extPosition); } -- 2.43.0