From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 BC2C9459AE4 for ; Mon, 24 Aug 2026 15:57:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787587066; cv=none; b=J2Ymg9KeX1i5yArdmjcJjfqRPBxmneADtmLNHyu0h7a8ChvQHmOth52mxbJxY9VAyvWu6ohNLpB8xAKGlOnemC3xVFbKzms2JkQpbw4IUjPhNghPWIGeQu+Amtk2Y9HQ3/rU1Yfn/Eio5ZdOjgW5Ay6cJHZeCoTYlXwxPab0aTc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787587066; c=relaxed/simple; bh=Z5tAT/mbHuc59Ui9YJ/aI3T6aE8OciceI47oDPSEdQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YH/U3aP499zUdx9w/dw58sXXBZ+nAaX+wVLcuyLVf4ip4Cnv6zGa2pBIu/v7BrDv48gEgln/Dw/B6lG7RIYHs95ra3AAAQvlUvXsm66aBg3cAfH7cf+lmYjsrJR/bogqpXMaOYCrZykM7EJj9Xu9xocABfqrpPVVGocUmNjeohc= 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=Ho3s22j8; arc=none smtp.client-ip=209.85.216.47 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="Ho3s22j8" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-383cb94f742so3785419a91.3 for ; Mon, 24 Aug 2026 08:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787587064; x=1788191864; 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=eYsIP6CPJ/D9oHNd/lqnV+fm0zd/HlHbMPOSyKSlzQs=; b=Ho3s22j8XdqPRI0rJsTmxVW+s89FaenZFStIE/J/Ms7190D7GLMT3MXGnE50edf0UI qfR2P/XDt2Ey2hLxNmcP3lVkxxtGHeTSDw0gssNOwZPWIRzmtb5sN+gLa/99da4uWbpU igbyg5MdUqdc0W0qLqWESde3DUaTVNkHtzjkdQjH1aclE9XzB5S46kO0BegW84Oy9hH5 KLglddZuvEwaSePdguwvB27/JbOfXTrEfbMA88nHUnaIQU2zcxuKCfYV7rqAviDMKpX6 ykZaQ5DO8Pkr6QIqjkYBu9uZRkqccxVmcR/Pw/Gzj2TIiSGL+qNtEO7B2pIHNyu2ZAkX Swxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787587064; x=1788191864; 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=eYsIP6CPJ/D9oHNd/lqnV+fm0zd/HlHbMPOSyKSlzQs=; b=X6ufWtz7PONl9umL0DSjc5sJu3ioWkRD/l2Oa3nRlvDE665699p5FmRfkkbhqxZqKK jk3Dd6D0V6kkk6mMm1bcuXYDpEDNwKUacGn/Wk2R4vh+mnuCjTiT/aGHK6sRdiFyavN+ fV2KICYvERXgTu26mqsRKICPu90xuKiQQTF6SUjh55xXs6RYU8iQ1um5kJgezYPGyIWK RJHhgHClItovz1jl8jcVkzFR1HPI1/Ma1Z0X/UeeqCMCshYhv79Cg+FYF+ZhpMvv9Fgc j0fwmx8d3UXjaytmcuocHZX2fr53bBEWl8lM/NfaaSJCpywNQoXTSrarq5+vmNnuiV9X ci9A== X-Gm-Message-State: AFuF++kjG5Cv6hNggBQSU/+yU+rO6HC1KAurzFFXjbm71V4fBs4zoU1G fQbicHaOuWJokAcAtKC3e/be0xAYej5XmcXlQxDyLRgtod45W7oqIZeGMVTi9g== X-Gm-Gg: AR+sD13NycIO56Gu6YgUsfYLXoKszJJidIK7ptY+kZkmJKK5TkbWww87IPTqrEbKH9n Mi4kHks/XyZ9vR5is2ygdPatODqj94VoCavyjVjGEStdLsJJofdtzJRscD6SrDhUw/7Bpl3vGN/ Nr0hRuUdN/leqix4dSENKjJELS/KKULYdqbnLC7qWmKS0sYFVPve0o7iMuYUuporpIXxlXBdeY0 5C5XpmDL44BGg0LPJLOhyuTnzlvwVpbuDSO/CyCxg/11Xt6PsbOkrVrIeyp0QYp/l997Gv1aB4i Uw3leS0h2cc465BwLnBmghrTIp/3xu+9MQgp87WNMPzvO6q3+YetZzfU/kNw1g8irhRExRE1OW8 XbMpjm6esj1BQ1WhYr3TY0ix3koqK8mJ6RfkXAsR5Gr7dNBo7O/VQlISEgqUWgPtpN4qPOPYYy/ F5sd2a05wv2MQYrtn8AIpHNAwimbtl7yJHb4kGZmYgKq6ifKpnRwaMg5CcG/5x2NIF6GGlXGZi/ XO1uOQGxs9bVqWmwjN43xjzd9I21NHMFJxZDd0MWYBJrMk4NNtFHHhVcdQOXa2kzd6uJg31jYiI FuUVCnzVsP1ae+ilAP8RfZGZ6fu3Lo2y3V0L2VKjhPLD51xoEfaD/rNPJWLqkc2O+rDFtxAmu6M GGwEAqvOzMc4XmwLFC4sYLevjna/VQ2rJe2JeiDB4FgYltu4= X-Received: by 2002:a17:90b:1f8d:b0:38c:a59b:5189 with SMTP id 98e67ed59e1d1-395df67778fmr36770322a91.15.1787587063832; Mon, 24 Aug 2026 08:57:43 -0700 (PDT) Received: from localhost.localdomain ([101.251.7.10]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-327f91d37cesm32210430eec.15.2026.08.24.08.57.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Aug 2026 08:57:43 -0700 (PDT) From: Laxman Acharya Padhya To: linux-bluetooth@vger.kernel.org Cc: Luiz Augusto von Dentz , Marcel Holtmann , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2] Bluetooth: hci_codec: validate vendor codec count length Date: Mon, 24 Aug 2026 21:42:36 +0545 Message-ID: <20260824155736.54542-1-acharyalaxman8848@gmail.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: References: <20260823161638.32348-1-acharyalaxman8848@gmail.com> <20260824144051.50010-1-acharyalaxman8848@gmail.com> <20260824152029.51492-1-acharyalaxman8848@gmail.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The Read Local Supported Codecs parsers consume the variable-sized standard codec array before parsing the vendor codec count. Although the initial reply-size check includes a vendor count byte in the fixed layout, it does not guarantee that the byte remains after the standard codec array. If a controller reply ends immediately after that array, calculating the vendor codec array size reads vnd_codecs->num beyond the skb data. Use skb_pull_data() to validate and consume each codec header before using its count in both command variants. Fixes: 8961987f3f5f ("Bluetooth: Enumerate local supported codec and cache details") Fixes: 9ae664028a9e ("Bluetooth: Add support for Read Local Supported Codecs V2") Cc: stable@vger.kernel.org Suggested-by: Luiz Augusto von Dentz Signed-off-by: Laxman Acharya Padhya --- Changes in v2: - Use skb_pull_data() to validate and consume the standard and vendor codec headers before accessing their counts, as suggested by Luiz. net/bluetooth/hci_codec.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/net/bluetooth/hci_codec.c b/net/bluetooth/hci_codec.c index 5bc5003c387c..7a7e813dcdda 100644 --- a/net/bluetooth/hci_codec.c +++ b/net/bluetooth/hci_codec.c @@ -145,11 +145,12 @@ void hci_read_supported_codecs(struct hci_dev *hdev) skb_pull(skb, sizeof(rp->status)); - std_codecs = (void *)skb->data; + std_codecs = skb_pull_data(skb, sizeof(*std_codecs)); + if (!std_codecs) + goto error; /* validate codecs length before accessing */ - if (skb->len < flex_array_size(std_codecs, codec, std_codecs->num) - + sizeof(std_codecs->num)) + if (skb->len < flex_array_size(std_codecs, codec, std_codecs->num)) goto error; /* enumerate codec capabilities of standard codecs */ @@ -161,15 +162,14 @@ void hci_read_supported_codecs(struct hci_dev *hdev) LOCAL_CODEC_ACL_MASK | LOCAL_CODEC_SCO_MASK, &caps); } - skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs->num) - + sizeof(std_codecs->num)); + skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs->num)); - vnd_codecs = (void *)skb->data; + vnd_codecs = skb_pull_data(skb, sizeof(*vnd_codecs)); + if (!vnd_codecs) + goto error; /* validate vendor codecs length before accessing */ - if (skb->len < - flex_array_size(vnd_codecs, codec, vnd_codecs->num) - + sizeof(vnd_codecs->num)) + if (skb->len < flex_array_size(vnd_codecs, codec, vnd_codecs->num)) goto error; /* enumerate vendor codec capabilities */ @@ -214,11 +214,12 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev) skb_pull(skb, sizeof(rp->status)); - std_codecs = (void *)skb->data; + std_codecs = skb_pull_data(skb, sizeof(*std_codecs)); + if (!std_codecs) + goto error; /* check for payload data length before accessing */ - if (skb->len < flex_array_size(std_codecs, codec, std_codecs->num) - + sizeof(std_codecs->num)) + if (skb->len < flex_array_size(std_codecs, codec, std_codecs->num)) goto error; memset(&caps, 0, sizeof(caps)); @@ -229,15 +230,14 @@ void hci_read_supported_codecs_v2(struct hci_dev *hdev) &caps); } - skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs->num) - + sizeof(std_codecs->num)); + skb_pull(skb, flex_array_size(std_codecs, codec, std_codecs->num)); - vnd_codecs = (void *)skb->data; + vnd_codecs = skb_pull_data(skb, sizeof(*vnd_codecs)); + if (!vnd_codecs) + goto error; /* check for payload data length before accessing */ - if (skb->len < - flex_array_size(vnd_codecs, codec, vnd_codecs->num) - + sizeof(vnd_codecs->num)) + if (skb->len < flex_array_size(vnd_codecs, codec, vnd_codecs->num)) goto error; for (i = 0; i < vnd_codecs->num; i++) { -- 2.51.2