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 8DD51400DE8; Thu, 16 Jul 2026 14:13:05 +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=1784211186; cv=none; b=kEyflgWDZ0ygQfYqquNOUzs0/+IC80Uwm/Z4WntYftm/9LWWLyyMuDHQO/pkZvhZySwT5a0Q5EBfL+l831UP6UgjLRd7+M7SPC06OyzGDT6zjB2cQ+/gMp9GzcZC7uOmTjZukD9BK9kSieEuVOnYYcPIJ+XyN4yH48As6cqz2aE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211186; c=relaxed/simple; bh=jL+OSXGMxm3naeNdniZj5tg3PBtsiumT4U2bLiJ/hPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MRYX1yHQ6eD2d8NwQCnH++W8nKOh/b8TzRIWPy+KLI0C4a+3zULvpr9Et5oLRsPq/OdMN2u/90NS8Q6yqCLVUrenEtxF6tai6mfDFvnDxrZI/I3zO1b9/R4HI5QKKAhj9Tp1hY+oR6CHutLgQ/zOINw2guCBriV3U0cA818heVw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zB3F5SkO; 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="zB3F5SkO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2D141F000E9; Thu, 16 Jul 2026 14:13:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784211185; bh=8dgro+nkCemF14aTJZ+vOCLLKLVHc2NjfQw0jQDdxoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zB3F5SkOVAB60N0aot5LvbgfzGq/EnalZOAqJnrHasim6Xjrr0Gr8DtiPcbQVlCXr 4geHmvLsn2oT3OG1H3UhE7QGQqp13FCNDPSSycYbrlQdj4YH/+YCoscDMKGA7otZX1 KZ23Fz7li+lgmytuYGyffU0hsXJW/qNJWpVZQpVE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bryam Vargas , Jan Kara Subject: [PATCH 6.18 333/480] udf: validate sparing table length as an entry count, not a byte count Date: Thu, 16 Jul 2026 15:31:20 +0200 Message-ID: <20260716133052.018795162@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716133044.672218725@linuxfoundation.org> References: <20260716133044.672218725@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: Bryam Vargas commit 3ec997bd5508e9b25210b5bbec89031629cdb093 upstream. udf_load_sparable_map() accepts a sparing table when sizeof(*st) + le16_to_cpu(st->reallocationTableLen) > sb->s_blocksize is false, i.e. it treats reallocationTableLen as a number of BYTES that must fit in the block. But the table is walked as an array of 8-byte sparingEntry elements: for (i = 0; i < le16_to_cpu(st->reallocationTableLen); i++) { struct sparingEntry *entry = &st->mapEntry[i]; ... entry->origLocation ... } in udf_get_pblock_spar15() and udf_relocate_blocks(). A reallocationTableLen of N therefore passes the check whenever sizeof(*st) + N <= blocksize, yet the consumers index sizeof(*st) + N * sizeof(struct sparingEntry) bytes -- up to ~8x the block. On a crafted UDF image this is an out-of-bounds read in udf_get_pblock_spar15(); udf_relocate_blocks() additionally feeds the same length to udf_update_tag(), whose crc_itu_t() reads far past the block, and its memmove() through st->mapEntry[] is an out-of-bounds write. Validate reallocationTableLen as the entry count it is, with struct_size(). Fixes: 1df2ae31c724 ("udf: Fortify loading of sparing table") Cc: stable@vger.kernel.org Signed-off-by: Bryam Vargas Link: https://patch.msgid.link/20260612-b4-disp-91780c4e-v1-1-f15112ff6882@proton.me Signed-off-by: Jan Kara Signed-off-by: Greg Kroah-Hartman --- fs/udf/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -1426,7 +1426,8 @@ static int udf_load_sparable_map(struct if (ident != 0 || strncmp(st->sparingIdent.ident, UDF_ID_SPARING, strlen(UDF_ID_SPARING)) || - sizeof(*st) + le16_to_cpu(st->reallocationTableLen) > + struct_size(st, mapEntry, + le16_to_cpu(st->reallocationTableLen)) > sb->s_blocksize) { brelse(bh); continue;