From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3311DC433F5 for ; Fri, 1 Apr 2022 14:25:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346877AbiDAO1o (ORCPT ); Fri, 1 Apr 2022 10:27:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346863AbiDAO1k (ORCPT ); Fri, 1 Apr 2022 10:27:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D3B719E396; Fri, 1 Apr 2022 07:25:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id F334CB82466; Fri, 1 Apr 2022 14:25:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25E13C34112; Fri, 1 Apr 2022 14:25:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648823146; bh=su2KRCwuNBQc7cumBH0i19tL0bZ1Vk8IOtg5gBsMwE8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B8u2gZZ20ooYEha3m6tIE8lvxp9Xa0PQaJMiweJJqAWQuHO/EnZXFRaQvrJQ+yXvS iJ1rdIqWqGc+4Onxd8JTnvfUS7Z/ookj44cCV92PBnjxjWBMMRA3G0+jy4rqlZsCrF 5mHX+nKkwYAWNJcDOo8Vdvi4xC38Mc6zYchB1dXnQLltya4fZatYrIYeW9+Ru3Wr0G fEsgGfOSkZPMKJiGkZAe9RERjyTYSg+qqf13f9f5X0lJphUO+k4ZjCleqLPC7lERKE aXVv5/A93c6Bm0A+K8wS+Bw6UrjpEMZjEs2obs5wBJXNjJivJAhMn/QCY3ylvFda68 OaDRk9/kYvjmQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Soenke Huster , Luiz Augusto von Dentz , Sasha Levin , marcel@holtmann.org, johan.hedberg@gmail.com, luiz.dentz@gmail.com, davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 004/149] Bluetooth: fix null ptr deref on hci_sync_conn_complete_evt Date: Fri, 1 Apr 2022 10:23:11 -0400 Message-Id: <20220401142536.1948161-4-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401142536.1948161-1-sashal@kernel.org> References: <20220401142536.1948161-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Soenke Huster [ Upstream commit 3afee2118132e93e5f6fa636dfde86201a860ab3 ] This event is just specified for SCO and eSCO link types. On the reception of a HCI_Synchronous_Connection_Complete for a BDADDR of an existing LE connection, LE link type and a status that triggers the second case of the packet processing a NULL pointer dereference happens, as conn->link is NULL. Signed-off-by: Soenke Huster Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/hci_event.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index fc30f4c03d29..e47cde778b1c 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -4661,6 +4661,19 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, void *data, struct hci_ev_sync_conn_complete *ev = data; struct hci_conn *conn; + switch (ev->link_type) { + case SCO_LINK: + case ESCO_LINK: + break; + default: + /* As per Core 5.3 Vol 4 Part E 7.7.35 (p.2219), Link_Type + * for HCI_Synchronous_Connection_Complete is limited to + * either SCO or eSCO + */ + bt_dev_err(hdev, "Ignoring connect complete event for invalid link type"); + return; + } + bt_dev_dbg(hdev, "status 0x%2.2x", ev->status); hci_dev_lock(hdev); -- 2.34.1