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 15BFB368D40; Tue, 21 Jul 2026 22:35:38 +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=1784673340; cv=none; b=QZre2O2mWFd3MUni6dSOTwVPbbwoAinV9IGtWS+Fj8YhPe9klkvfUWHD6Zcmu625EdlBCNVx9C1H/3uLfiX6nrPOweDWY0XlqgiCJEpEN6vflQ37JxMRk2FrKCZXsN0leq1wSwveh2UvARbEkPU05sr+uIjaFpVBltB3RTBJTQE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784673340; c=relaxed/simple; bh=kGgy0goSpLgOmmKIP516DBo+sKvmrM3vVDeYJ1/SgnI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RhX+Ze50MZe5K6JCOuhFR6bGCrOmmlesFX7r9OrhCTcm7cXwxXcvinV+08Q0X+J5V4ne59IUFA6xawUjPRKJ56JgA3MPk+iEu1mcerlVKXOkMltz6GuQRkYtbmZfyjciIBx+1UtVQvY21jFZI3kKj6zEk5tSkXQQuPx1LXS8BrM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sUsTBfWL; 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="sUsTBfWL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B6241F000E9; Tue, 21 Jul 2026 22:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784673338; bh=xSlwahP6mC43+oozhfziTSsaXbgoYKImcaDxJmUxJgU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sUsTBfWLKASeLJFCWvewMbXizjEEFzX9d1dzgioWyJis2QVkipa7iOD4D6YAGGeQr Cr89GyC+8bXWIkBcSnHf/1v9zq90quIrLUdDJvsFoHzk0elmU9oiaEgn1wnJEHUo6r j1cx2Q0DHJgnZCa6QBWtHzAovfdh5MWTcwHxZu1s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bryam Vargas , Jan Kara Subject: [PATCH 5.10 123/699] udf: validate sparing table length as an entry count, not a byte count Date: Tue, 21 Jul 2026 17:18:02 +0200 Message-ID: <20260721152358.480490846@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@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 5.10-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 @@ -1396,7 +1396,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;