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 67D31C4332F for ; Fri, 1 Apr 2022 14:27:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347107AbiDAO27 (ORCPT ); Fri, 1 Apr 2022 10:28:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346996AbiDAO23 (ORCPT ); Fri, 1 Apr 2022 10:28:29 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E59AA1DF855; Fri, 1 Apr 2022 07:26:39 -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 A110EB824FD; Fri, 1 Apr 2022 14:26:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D400C34111; Fri, 1 Apr 2022 14:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648823197; bh=i4thxzazsMrvV6+OrMgNHpCD1BrjujPV8ivaYkSDGZE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A2LLqRLzDHUGOAx7P4LHNH7VHYOIunJ3oBvMo7Hp0Otkp36D4kVTYEc0l54YZR9P2 OM0KOurmwR30K6t8v0ZJQ8WK8H3YitNHtRx7NA8wdRqa0/XlVaJvV4N6R9fmymqN0k 02EvMZob4DonwsB+Ie+b9wMxf6Rx4l/Pf1fQ5W4McVcFvQFlHXjwYXtOgRgUWgKeok 4L52tPXRxkS4SdpKcRWC5ilLfoT3/Y2ffvwUkyezHe2VpOdOYOgNOd+yf0RsUFnBLR 3leoOvzgPMfJzFJBI0gap3NYwiPB0HLfDQnVWIAjPn7d6TApe3jywgBOIwyPUxz8Yr Qgv5e+9nAGGcQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luiz Augusto von Dentz , Marcel Holtmann , Sasha Levin , 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 018/149] Bluetooth: hci_sync: Fix queuing commands when HCI_UNREGISTER is set Date: Fri, 1 Apr 2022 10:23:25 -0400 Message-Id: <20220401142536.1948161-18-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: Luiz Augusto von Dentz [ Upstream commit 0b94f2651f56b9e4aa5f012b0d7eb57308c773cf ] hci_cmd_sync_queue shall return an error if HCI_UNREGISTER flag has been set as that means hci_unregister_dev has been called so it will likely cause a uaf after the timeout as the hdev will be freed. Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/hci_sync.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 4426cc2aaf4a..21350dc88868 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -379,6 +379,9 @@ int hci_cmd_sync_queue(struct hci_dev *hdev, hci_cmd_sync_work_func_t func, { struct hci_cmd_sync_work_entry *entry; + if (hci_dev_test_flag(hdev, HCI_UNREGISTER)) + return -ENODEV; + entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) return -ENOMEM; -- 2.34.1