From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (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 5FDDF26B75B for ; Wed, 15 Apr 2026 12:32:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776256349; cv=none; b=nlttueuZof4oTn/a32dKJTM6IhpNs9FhINFhhKIaJPudiEaQ1cLaWmNpv8wuUqvrjTebqVqgn4E3nEOZHWl0pApJD7otYGMKHvsoAngt15wwVJZ8a1G1eATPnyCc5OgJKfq0ZhMq/e5E1fLpYhFIdOLQhFtiLWZID0eCcIinCN0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776256349; c=relaxed/simple; bh=V5rhUICHKrtVS+VjsbYW9zZmMYRMee5pEQyn/IO+H4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Re6NcfW1rELB4j2QQZlHi+2Oov4oILrf6UBJBbJTWhTkvJhCWUfwRkr8XLHuL4gkXOC1dV+zvKSjOiuwOzH1th0PogVqSEW4KTkcCM1ANpDhMXYK1f/YtgRtcN6291EigfyAjaAdLG29s5NQ9HX7CEBBIh0kIm84Bc9P8RfRAhQ= 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=IActRP8x; arc=none smtp.client-ip=209.85.160.174 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="IActRP8x" Received: by mail-qt1-f174.google.com with SMTP id d75a77b69052e-50d8e11b948so66698681cf.3 for ; Wed, 15 Apr 2026 05:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776256347; x=1776861147; 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=S4tBTeu6/viYuFA/jm9+9NVpLFwhjRRaKWPLY9i5P/o=; b=IActRP8xapeA8cJ3JS9dfgHRRssqS44VtHYGLuz6Hlb+3pkCkBG9ratwxAXBa1OPJ2 G+7+7qA9oZ7TvDqmCGnC/H+htSYWrNo5U7xQGaHAGQNmFp0Bdp13P08mna7v9FpjWifj gOAfdP9vrJoR/Fkvo9NZS4VOcsf6Uz9fbYuo6fhbNr3GFXxZEYF+PTKraG161LS+WUBv tadv/SxNfVate93ppjIlfJYfqkFVT1y/H+2ceqH9pu2hEY09sd/jHH2aQxMMEoF8ibCi L5LMS4WHZmvFZGoi/W5tlZwJk4S1EixWr+VWHUortmEpkBCTwyLjXQIhaKuNnE929M2l 73vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776256347; x=1776861147; 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=S4tBTeu6/viYuFA/jm9+9NVpLFwhjRRaKWPLY9i5P/o=; b=CWsoheidFS2HGyRJgQWTuvTnE4XSn0mZBgO0HheS8y6CzsjSFmuqTy6rrv88M9JScD Ue4+Yciire0cH3vjcz43Nx9flXvhGVtiKk4T7QtdDye+VRaiytU2NdLCS9wOpHoyJbry NAZWTl/EbrXqfsZ1uYlGkezNU1qUWHExlgLmZij8po44Y8lnk5sqhEHpElyw9kmPECBi y3yr1FhjPFkZb8AIzNLVY3HOeu7txf8w3GeTDjd77mbDKgjHN1J6dCU4zF68K/tgAXJY ECxVI76ObMqLvAEzPVI7+yZKWj8sVeWdeuo9Uq72/Xcwgh6q2EhQ3gw81T7kOtzt6/K8 RrbQ== X-Forwarded-Encrypted: i=1; AFNElJ/Jb7rsu1419UtSPPjwfLYsvr9gp1Ci8DnDzL/6V/57QP34OFycH2q8u3IM62e1cckH/Arn/yocmzrZUbY=@vger.kernel.org X-Gm-Message-State: AOJu0Yxf2o+Rr4MvrSIzGFTN3pJDcMgjAP1SUFI6UAFuwHQ1Mhofi6k3 MQSSbKwVobf6Cblvmpp7nI15OsECo4zBnehY5DNVN7nWGIOGoWvTxxSdBMxsyw== X-Gm-Gg: AeBDievnsBnMzZDGTohyW/Ga42AfZn3m1WR83SBnRoLNLWyIcJ0La4LAGUp1QD5sZ5k 2G9gvcF9Ywx1wEMUlyV2mObzewpBqPZIltYSc5VPs84z31Y2vFMhkJrSq0anSkujDBCjrGytuwl HDRgQX3YEEzajYS6hplIxSfRO9OYXAu8HgXJbRzjONvSKlcdN+p394QT3UTM4qAkR5ucEjc1cxG w2HXgB0ZeON13Db3mpKO96vGUetDADqihZw5yP4nqK9V78dw8pWxXHJ10rM4rWreAdBQzhPO9h4 l6L4nMX19DtLLpnVfqrEx+IgAgvg0MgWSceEUPIjX50WLdlzOJg1Qt58BbZzPnQWXNYUHgHADJo DC1SatKuJrnlrGTs5MJCpNIq/3H13unJCfFgPDc2qxuhlTR9/3oYJiCOtB3p6SlTZgYfV3sbwi2 NxTtDnah4jW1xINRGTDJRQ9Ya8H+FVXyOemtJbqTNSht2WamlAxLWfnDxVu5y3CbZjoZ4TQjcEk dS9ISREdn9EzDg13VBGBUkaSJIAokfFVCi0AFIDTO6tuVBskrnFjgietcJLZF/r X-Received: by 2002:a05:622a:6694:b0:50d:41fa:80fe with SMTP id d75a77b69052e-50dd5bd98c4mr217424231cf.53.1776256347106; Wed, 15 Apr 2026 05:32:27 -0700 (PDT) Received: from server0.tail6e7dd.ts.net (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50e1af9dc5fsm11747771cf.16.2026.04.15.05.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 05:32:26 -0700 (PDT) From: Michael Bommarito To: linux-usb@vger.kernel.org, Mika Westerberg Cc: Andreas Noever , Yehezkel Bernat , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 1/4] thunderbolt: property: reject u32 wrap in tb_property_entry_valid() Date: Wed, 15 Apr 2026 08:32:17 -0400 Message-ID: <20260415123221.225149-2-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260415123221.225149-1-michael.bommarito@gmail.com> References: <20260415032335.2826412-1-michael.bommarito@gmail.com> <20260415045246.GR3552@black.igk.intel.com> <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: e69b6c02b4c3 ("thunderbolt: Add functions for parsing and creating XDomain property blocks") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-6 Assisted-by: Codex:gpt-5-4 Signed-off-by: Michael Bommarito --- 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