From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 163BD3CD8CC for ; Sun, 3 May 2026 14:15:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777817735; cv=none; b=LmN321PvBqQ+wA939RuWPXjj93uhyx/vgBjDqMfq2bb9VWQIa0tEQQRRQ4M6/vMFIPXwlCJdo4D1ZRBq7ERduvrlFaXN7nUgM7wXGuG+kbe16dVH6dHktABOr7c52nAe6Y41snxYoLshqhKjBDiBaBhHbHr7b5K7Spb8/MzKILE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777817735; c=relaxed/simple; bh=da761sZYS8Qfcqjx7tTH+rDqBWoz2Abmcj82tsKx624=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bxlm2xjRQZD2w6tJLROWiljAyeTznRnm5uorInahCmCx9ApUHjgVS7Dovy4MnL2hbzfW22w0gXG2a1IbEsDFUcHB7WlPn+b5YiQWkJ+I7BwwXk56FWfzMv/JG5ybrmRoOqAB14TQX1nkYVFPgFTG1D1MrT9cPqyygy2hbOSaibg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cMnpt3DX; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cMnpt3DX" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-8eae9229110so593205485a.1 for ; Sun, 03 May 2026 07:15:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777817733; x=1778422533; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9iAjdO9SNYauCKwr63OH+1/upS4pxxHhAek9kVw0MsI=; b=cMnpt3DX4qyyj9S05I043vTa5A8ZutsEFrFxRJIpBdnwvcWGR0iYuu+G2uwTba4VhZ KBhJ4AEKeged0naEkU4Jzs03boayyQUdTC93Z90hhIsPt5qcEdgjaizr9m0NqNr/r12a 2pymdWVUcQ0dzTmpiyT4eZSCXmnXOeWXR+IEF7ZYc4u4VqMBQvFGV1mbGxxY3wGedl/5 A2y0kMdfRiDZL6V+GHy2uRXCDC3l5vsnGq+RaRpZZIEaLdFRoUanc0VJ6AfdZsY/zG+m cmKr9Fh0VLz1sAjh8oCK/dyYuPVBBqsfbm+gaeA3FbxDlSPHfryiVBiA1Sp1W4291AqT ka/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777817733; x=1778422533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9iAjdO9SNYauCKwr63OH+1/upS4pxxHhAek9kVw0MsI=; b=K3RPwjIWIWDdz7ziVk/iFIMfhUwIps5KAu+xTm9ENQBI4YnElZ5wH0oKoNBWWWxu2c rioXvs35erNox9uJQqZY3mKAivw+vhH1ocJMOa9QnVz1plNTgXqeAtWGWFv++LtADC0w CIGRFu/pHtWjXcU8o0g77xj0scUggp+V+yeet2Zd4tQQggtlSD0Zj5dS7PdRiaYcwG4K P55JADFu+0W3Lfc/2oynbYszP6740Jaao5cJDTPAqasVUaQ44AUSAmuqmhwY4zE2ogjM dcu/7UqGb7LYWrdvyVkHZiB4fjWzxcGLR90ewFV+90Y0qaNDNU/2XBlNedCiTtzxTFJL NHfQ== X-Forwarded-Encrypted: i=1; AFNElJ/uD3ngJ1/Ohln5s9hJpfouf6Ucj5mikbKmW8pPWYGyU0hVFQS/0HkEOT7PhXYLzcN40imlfZRgNWsagLw=@vger.kernel.org X-Gm-Message-State: AOJu0YyeqxoownPYScZnqZD1hC/i+CGq4TbbrA2kRBGrt/HNR8tqPAy4 dq1pCj5flN2CG4xlD4Ne/yJNgPYRsAHdTcFd5AneyrfHE6oIpKpMNw1a X-Gm-Gg: AeBDievtDscidh8Hnx1mmDTvydMwFQHZzjLK3j9+r+COD3/cnoEBWJNKGGuRSwAzaNp GbpXc7JzB6br9tBKHPPd5TjFvv2i7UtLQ8iyeO2erE9aZKUDIBChCAw+1BHrgJGcKGvW2C2hvXd 2zvQSd9VWCPN0fbPkVWBSaQuKJAP8up+CNmvPmztiGWnyzFHpQXAR/D7NwLWNXs1a5jexZ0vzz9 dhThXDMYdId9eLXF37zJ3iIPkffNjG5NHhMeS08kRwFCoU3PG825/yX59yQXGPCOVySVBL/waGD 5LUJO7vzUHwj5sHxdy9pTQWGZLPDQXNBIgshdDWoRj3Tp5KTnXK80ShIIGNM2caP/COFUq0oP+z oUbbfBHL4/iZHf65tCmpvpMVevIz3p9PonAn7rHkEShifhiiDHUf/cp9v5W6W+Qodw/dXPN5Iop Y14gk+LSyQtaE+B/pBJYbw5SEPa5S7L90fQf6nZevVJgFjYYmlIsnZna5ljlmbZbh/jK8dFUes8 Xqk+Kym7Ev4LHbhZ35kuHqwWTphWZE= X-Received: by 2002:a05:620a:2a0c:b0:8ee:630e:351d with SMTP id af79cd13be357-8fd15ade400mr1019838985a.12.1777817728309; Sun, 03 May 2026 07:15:28 -0700 (PDT) Received: from server1 (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8fc2938e0b9sm766261985a.9.2026.05.03.07.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2026 07:15:27 -0700 (PDT) From: Michael Bommarito To: Mika Westerberg , linux-usb@vger.kernel.org Cc: Andreas Noever , Yehezkel Bernat , Andy Shevchenko , Michael Jamet , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 1/4] thunderbolt: property: reject u32 wrap in tb_property_entry_valid() Date: Sun, 3 May 2026 10:15:05 -0400 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: <20260415123221.225149-1-michael.bommarito@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit entry->value is u32 and entry->length is u16; the sum is performed in u32 and wraps. A malicious XDomain peer can pick value = 0xffffff00, length = 0x100 so the sum 0x100000000 wraps to 0 and passes the > block_len check. tb_property_parse() then passes entry->value to parse_dwdata() as a dword offset into the property block, reading attacker-directed memory far past the allocation. For TEXT-typed entries with the "deviceid" or "vendorid" keys this lands in xd->device_name / xd->vendor_name and is readable back via the per-XDomain device_name / vendor_name sysfs attributes; the leak is NUL-bounded (kstrdup() stops at the first zero byte) and untargeted (the attacker picks a delta, not an absolute address). DATA-typed entries are parsed into property->value.data but not generically surfaced to userspace. Use check_add_overflow() so a wrapped sum is rejected. Fixes: cdae7c07e3e3 ("thunderbolt: Add support for XDomain properties") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-6 Assisted-by: Codex:gpt-5-4 Signed-off-by: Michael Bommarito --- v2 -> v3 (no code changes): - Lowercase 0xffffff00 in commit message. - Fix Fixes: SHA (was e69b6c02b4c3, "net: Add support for networking over Thunderbolt cable"; correct is cdae7c07e3e3). drivers/thunderbolt/property.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c index 50cbfc92fe65..f5ee8f531300 100644 --- a/drivers/thunderbolt/property.c +++ b/drivers/thunderbolt/property.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -52,13 +53,16 @@ static inline void format_dwdata(void *dst, const void *src, size_t dwords) static bool tb_property_entry_valid(const struct tb_property_entry *entry, size_t block_len) { + u32 end; + switch (entry->type) { case TB_PROPERTY_TYPE_DIRECTORY: case TB_PROPERTY_TYPE_DATA: case TB_PROPERTY_TYPE_TEXT: if (entry->length > block_len) return false; - if (entry->value + entry->length > block_len) + if (check_add_overflow(entry->value, (u32)entry->length, &end) || + end > block_len) return false; break; -- 2.53.0