From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (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 922AB3AC0C0 for ; Tue, 7 Jul 2026 22:05:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461941; cv=none; b=K3cgSWwiTXIqnw0slzVXvx4p+iVL+GyFpScYLJWf2AJe1MvVQzfoAciaWzulynmtv1FuFyAoxsmF5azir0cHmn2Akza5nkdHJYWdDfqeaBwQNYE6MBlmigoNRbnw6PzbsBZWckoMCHLxWXMXZUeGOVG16Kc0BZG53WPq/1lT8Ds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461941; c=relaxed/simple; bh=HD/IfcKOQqrgbt3YrPnPJCPNGxQcu/04dn/Qg516ZiY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IyZH+//I6HUcwdN1/BUbua8ue+UP/+NvXTlVkkobQW9wMXYkEwIGpxNQ/qfmBr9Dx6tONbRuPCpNsLHTxpd2Oe8Jl0OxGJyuCYzT6+Z/VxcjVW71+pAOUoEuxHOoiJGtIDvqF96mbMvU9ut9rBMn+38E1YuN5BJPe1m6nmspRfk= 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=O0Piza/V; arc=none smtp.client-ip=209.85.222.173 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="O0Piza/V" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-92e57a753f9so345025385a.2 for ; Tue, 07 Jul 2026 15:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783461936; x=1784066736; 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:content-type; bh=Yxeqz0kniPlz7hPvLPMhtJlXvKgsX6m9zByp2BZxHio=; b=O0Piza/VKyc2gRuSBNGG3Gtzyecmafmjs07DBHa5SKdBXC78wXleL+xrzvnYzGc77G rMOcv96MBuZUhMB7hUm4dZsq2SU01qlLj0jsGBrAqXnom/7m6L/YFjKjqEKKOk/NmHOA JbbvVpc1L06Nv2SZcav+/RWKUBMu08DauBk+ACqJrndeaSsxFvMqs7MlX2svFngwzuTr vjduUlxuUr0Vwg1nsysvc3HEJ6+NOlZKvHIEqNRFDNmypnmJJaTcbkf3lcT4irmIicXK 6oJKpN+r4mPQ77OBhhkD8+0Knl8qOReVfnZmCNieWgi5M3SOSrDGvi0Al6Kj8UcwaxG1 Iniw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783461936; x=1784066736; 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:content-type; bh=Yxeqz0kniPlz7hPvLPMhtJlXvKgsX6m9zByp2BZxHio=; b=nW3cf2aOGwMC0Mdf/yIHPxOrohIRlC4bmwVGETxxpsUG9n6sx6980Y4dV4Pqrt84YE TxAws1nikCkdpoPJlUnQF7bVR8SjAMyQpogGoosOHM2kklPlZU3TdmpLiz/ak2ridolf p69IDQudkmx5Dp8eXsfY671epBgALlsgFZYZ64KwklykqclwvFy9AIknLj/nkbLrxYN/ 2XE1qfdFqcn3YKWFGHS4k4ROPBLTQvHTbQqg30DA7iQJkNke3+sU2ZgbXj5NMYNYYjPL abpaLvIRj4fUZwoENt4rDCcgd4H+WQOBM3o9Z+UPYoYwRu6U5XfkqqMWktES8TrfMxWI g4Tg== X-Forwarded-Encrypted: i=1; AHgh+Rr+uYNMKehfwNOLEve+/i9nJjqtPuvGqcLCWEZ0hkH7M6qtOtwfb3k4QE5PIJeWLQXmmAemUQdBHWNn03E=@vger.kernel.org X-Gm-Message-State: AOJu0YxIDhOY3xW5Di5ny808IqaiYW3bpdBOqAZXxKs8m2PQiyuKwtvb o3s7QADLvwK0d/2bxp6NKbVwSllZxOed+5oA5+E6NvmKmvithQ8unY5G X-Gm-Gg: AfdE7cl5wyWyknTUZ17R/kprPy34hzNtcWPgCXN6TG7t2Bgo2iO1BJz1Ny2AIZmjWv3 oIN37J1tMtpGLp0UZeGQU6s1NCzebV8eRcsGSZ2V8aVW/SJXs/LQx9wROTrfPQJzAC3qm2kkYJL Ubzt3XJXbtwj2ODoZX89GDRva38thWGydSsrAKmILs2v5kP73brH8AJHyVbxUEeeFE4N5srwUD2 dGT69IDuDaddphi9IrWetNSaTNmQSjp/5YL7A1B08RzRBATm4oNpUxEx3cAXyR6TPa6J5ApncU/ X8xd8FJJwBQ5BIrcrYdfca539JW0JfpEJww7GF1F9JyJDs7SZ4bi7R+73O3f0O3keHYOzh4+YsO ur1g6ca2BByvQCPTXTQxywrv93JKXFYyN7YMhnYWkWu5vJU9vByeiZpYQFRiSSSu9Jz4OtSoddb 5ryfgI8W927m+FkrKcuTQLSJEEbtrp23C8wamCySlTOKUxj4FXOAQcCY10RV2DOT0g+Fuec0m7+ PT736lQ/MoSrqIVceIhNn1vh6qCEEfmGmiQOxQNHMmIxLI= X-Received: by 2002:a05:620a:2703:b0:92e:5bdc:aeba with SMTP id af79cd13be357-92ebb59045fmr842966785a.54.1783461936503; Tue, 07 Jul 2026 15:05:36 -0700 (PDT) Received: from jeremy.kali (srv1619992.hstgr.cloud. [2a02:4780:75:55a3::1]) by smtp.gmail.com with ESMTPSA id af79cd13be357-92e90cc18f1sm1250745685a.40.2026.07.07.15.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 15:05:35 -0700 (PDT) From: "Jeremy Erazo (Devel Group)" To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , Sasha Levin , Luiz Augusto von Dentz , Marcel Holtmann , Johan Hedberg , Claudia Draghicescu , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2 6.1.y] Bluetooth: ISO: Copy BASE if service data matches EIR_BAA_SERVICE_UUID Date: Tue, 7 Jul 2026 22:05:26 +0000 Message-ID: <20260707220526.271712-3-mendozayt13@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260707220526.271712-1-mendozayt13@gmail.com> References: <20260702144207.320421-1-mendozayt13@gmail.com> <20260707220526.271712-1-mendozayt13@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 From: Jeremy Erazo commit f4da3ee15de9944482382181329bb6d7335ca003 upstream. Copy the content of a Periodic Advertisement Report to BASE only if the service UUID is Basic Audio Announcement Service UUID. [Stable backport rationale] This fix landed in mainline v6.7 without a Fixes: tag, so the stable autoselect bot never picked it up. linux-6.1.y HEAD (v6.1.176) still carries the pre-fix code at net/bluetooth/iso.c:1613: if (sk) { memcpy(iso_pi(sk)->base, ev3->data, ev3->length); iso_pi(sk)->base_len = ev3->length; } ev3->length is __u8 and iso_pi(sk)->base is __u8[BASE_MAX_LENGTH] where BASE_MAX_LENGTH is HCI_MAX_PER_AD_LENGTH(252) - EIR_SERVICE_DATA_LENGTH(4) = 248. When an attacker within BLE radio range sends an HCI_EV_LE_PER_ADV_REPORT with ev3->length in [249, 255], the memcpy writes 1 to 7 bytes past the buffer into the trailing fields of struct iso_pinfo, including the low bytes of the iso_pi(sk)->conn pointer. FORTIFY_SOURCE flags the write with "memcpy: detected field-spanning write" but does not block it. The upstream refactor addresses this by: 1. Filtering via eir_get_service_data() so only the BASE portion of the PA payload is copied. 2. Bounding the copy with base_len <= sizeof(iso_pi(sk)->base). Backport notes for 6.1.y: * eir_get_service_data() is already declared in net/bluetooth/eir.h. * The header include for eir.h and the EIR_BAA_SERVICE_UUID define are added here, matching the upstream commit. * The put_user() addition in iso_sock_getsockopt() that was part of the same upstream commit is not included; that hunk is a separate getsockopt correctness fix and is not required for the OOB write fix (getsockopt(BT_ISO_BASE) is a controlled path that already validates optlen against sizeof(iso_pi(sk)->base)). Applying the getsockopt hunk here would risk a user-visible ABI change on a stable branch. Reachability: any host with an ISO listening socket bound as a broadcast sink (LE Audio / Auracast). No pairing required. Fixes: 9c0826310bfb ("Bluetooth: ISO: Add support for periodic adv reports processing") Cc: stable@vger.kernel.org # 6.1.y Signed-off-by: Claudia Draghicescu Signed-off-by: Luiz Augusto von Dentz [jerazo: backport to 6.1.y; add #include "eir.h" and EIR_BAA_SERVICE_UUID define; drop unrelated getsockopt hunk] Signed-off-by: Jeremy Erazo --- net/bluetooth/iso.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index 7ea3e6335..6b8622bec 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -14,6 +14,8 @@ #include #include +#include "eir.h" + static const struct proto_ops iso_sock_ops; static struct bt_sock_list iso_sk_list = { @@ -46,6 +48,7 @@ static void iso_sock_kill(struct sock *sk); #define EIR_SERVICE_DATA_LENGTH 4 #define BASE_MAX_LENGTH (HCI_MAX_PER_AD_LENGTH - EIR_SERVICE_DATA_LENGTH) +#define EIR_BAA_SERVICE_UUID 0x1851 struct iso_pinfo { struct bt_sock bt; @@ -1606,12 +1609,16 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags) ev3 = hci_recv_event_data(hdev, HCI_EV_LE_PER_ADV_REPORT); if (ev3) { + size_t base_len = ev3->length; + u8 *base; + sk = iso_get_sock_listen(&hdev->bdaddr, bdaddr, iso_match_sync_handle_pa_report, ev3); - - if (sk) { - memcpy(iso_pi(sk)->base, ev3->data, ev3->length); - iso_pi(sk)->base_len = ev3->length; + base = eir_get_service_data(ev3->data, ev3->length, + EIR_BAA_SERVICE_UUID, &base_len); + if (base && sk && base_len <= sizeof(iso_pi(sk)->base)) { + memcpy(iso_pi(sk)->base, base, base_len); + iso_pi(sk)->base_len = base_len; } } else { sk = iso_get_sock_listen(&hdev->bdaddr, BDADDR_ANY, NULL, NULL); -- 2.53.0