From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 994824E9C27; Tue, 13 Oct 2026 12:09:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791893361; cv=none; b=gAXblKZYLh2i6tmnkGXVeXVDQD+KxXUVDlo0eZxwYQ8uFU4Pi2lksA6Tjy7rih3Rj1qn1W7jwZf9umBDyLTFmKoH0dBAF5Vc1YV9sJXEpE4/Tok3Yb8OJGaeCW0144VSIebSFZOXSK04Nw49KPHvqFZCmYLgMJaRKQtqi3w5DH0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791893361; c=relaxed/simple; bh=K6bTciZv4zHcjuRfp9ZCawQNvm5hP2W6G8JHcfWhDIM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pMy57VPZ9hZu6FNu0KwjLczO883CrrEHExSuXucaH7ETLCrgRLhtggiTXrRJbCPP22G0bhDvfFp9xOEcTJSbB/ZYuitZ54ml9i/NtttLkp5GBMjUwSrOEDGi/sv460tbqzS4cobHaKGyOjxHh03eVBLwGUpl0pgx+WemBKaN9d0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vomQ+Uhd; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vomQ+Uhd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFE321F000FF; Tue, 13 Oct 2026 12:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791893360; bh=3bhSRySB6/XUcLDO1qwEujvCC1kozE9hfFIHRYrRzK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vomQ+UhdfnPPt2syR19qCenObJkRFeho9m3jo7oLfipgMO4/Ny7EJp6btTyn9o+cY zs8RoxluEfJopuxynHxEtnG59qstHr3dPus/z6KSzYtHF5QDv3uUXniCjQWz12fk5W a9VowEg4sv2oRspPLu7rz8aI1YpILZ3a750TFtC8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Seohyeon Maeng , Jan Kara , Sasha Levin Subject: [PATCH 6.18 198/621] udf: fix partition descriptor append bookkeeping Date: Tue, 13 Oct 2026 13:33:13 +0200 Message-ID: <20261013112925.562932473@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013112920.855194808@linuxfoundation.org> References: <20261013112920.855194808@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Seohyeon Maeng [ Upstream commit 08841b06fa64d8edbd1a21ca6e613420c90cc4b8 ] Mounting a crafted UDF image with repeated partition descriptors can trigger a heap out-of-bounds write in part_descs_loc[]. handle_partition_descriptor() deduplicates entries by partition number, but appended slots never record partnum. As a result duplicate Partition Descriptors are appended repeatedly and num_part_descs keeps growing. Once the table is full, the growth path still sizes the allocation from partnum even though inserts are indexed by num_part_descs. If partnum is already aligned to PART_DESC_ALLOC_STEP, ALIGN(partnum, step) can keep the old capacity and the next append writes past the end of the table. Store partnum in the appended slot and size growth from the next append count so deduplication and capacity tracking follow the same model. Fixes: ee4af50ca94f ("udf: Fix mounting of Win7 created UDF filesystems") Cc: stable@vger.kernel.org Signed-off-by: Seohyeon Maeng Link: https://patch.msgid.link/20260310081652.21220-1-bioloidgp@gmail.com Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- fs/udf/super.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/udf/super.c b/fs/udf/super.c index ff170bc0962b5..f91b231b7d7bd 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1704,8 +1704,9 @@ static struct udf_vds_record *handle_partition_descriptor( return &(data->part_descs_loc[i].rec); if (data->num_part_descs >= data->size_part_descs) { struct part_desc_seq_scan_data *new_loc; - unsigned int new_size = ALIGN(partnum, PART_DESC_ALLOC_STEP); + unsigned int new_size; + new_size = data->num_part_descs + PART_DESC_ALLOC_STEP; new_loc = kcalloc(new_size, sizeof(*new_loc), GFP_KERNEL); if (!new_loc) return ERR_PTR(-ENOMEM); @@ -1715,6 +1716,7 @@ static struct udf_vds_record *handle_partition_descriptor( data->part_descs_loc = new_loc; data->size_part_descs = new_size; } + data->part_descs_loc[data->num_part_descs].partnum = partnum; return &(data->part_descs_loc[data->num_part_descs++].rec); } -- 2.53.0