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 BACAD322A07; Mon, 18 Aug 2025 13:19:42 +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=1755523182; cv=none; b=ZLy4iNJvxZ8YoEQy8BG7tr3I+DNwlIo2H6SICc+89/EW8OGFvc1migrTk7e8eDLIjGRpaQNslpdSX8dXAWGBnjvw4AFa/ieoE+b27q6+UBbirV3Jqzet12sDc5vbMSuD61RqZ0k+dYoFwJXKxUnJmWKFrxJW0hpjNxorZlGZCpM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523182; c=relaxed/simple; bh=xVQ9DkF6ixBsi1Q7tV4Qjn49sDMaN4YClcPW09dVp3M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pA5pNDt32TOQnOMRu3W6JDfjgsMdoYMHawgn18nZSNW9vrASRA07T7GAFOMICU15+U7lHCbwelo0x75kYYflWEsZjdZoFOpcJbL5iZ98WZvF8Uhv/RMaR9P0ab/jguxt3We/Uwobtg9fNCYMSTTCXpgNP3939GEK0EC+m1YgOi0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=n4hTx6PY; 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="n4hTx6PY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4342DC4CEEB; Mon, 18 Aug 2025 13:19:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523182; bh=xVQ9DkF6ixBsi1Q7tV4Qjn49sDMaN4YClcPW09dVp3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n4hTx6PYMQpgzokOIv2BrKdmMaWhAxH7n/vyNMosMlYqQigBVOv3ktelhhfZoC6qN HygK7CVRQghwtbqav1FbCF0Q0ZzRud4yt46AjGKlY/lG0z4BtNBAGiABTU7b7Jjunb NKX0HOJURs0J8UPHY3CJcnInUOMfcpZ7mjqbE9YM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+478f2c1a6f0f447a46bb@syzkaller.appspotmail.com, Jan Kara , Sasha Levin Subject: [PATCH 6.15 096/515] udf: Verify partition map count Date: Mon, 18 Aug 2025 14:41:22 +0200 Message-ID: <20250818124502.077665917@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@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.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Kara [ Upstream commit 1a11201668e8635602577dcf06f2e96c591d8819 ] Verify that number of partition maps isn't insanely high which can lead to large allocation in udf_sb_alloc_partition_maps(). All partition maps have to fit in the LVD which is in a single block. Reported-by: syzbot+478f2c1a6f0f447a46bb@syzkaller.appspotmail.com Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/udf/super.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/udf/super.c b/fs/udf/super.c index 1c8a736b3309..b2f168b0a0d1 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1440,7 +1440,7 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block, struct genericPartitionMap *gpm; uint16_t ident; struct buffer_head *bh; - unsigned int table_len; + unsigned int table_len, part_map_count; int ret; bh = udf_read_tagged(sb, block, block, &ident); @@ -1461,7 +1461,16 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block, "logical volume"); if (ret) goto out_bh; - ret = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps)); + + part_map_count = le32_to_cpu(lvd->numPartitionMaps); + if (part_map_count > table_len / sizeof(struct genericPartitionMap1)) { + udf_err(sb, "error loading logical volume descriptor: " + "Too many partition maps (%u > %u)\n", part_map_count, + table_len / (unsigned)sizeof(struct genericPartitionMap1)); + ret = -EIO; + goto out_bh; + } + ret = udf_sb_alloc_partition_maps(sb, part_map_count); if (ret) goto out_bh; -- 2.39.5