From patchwork Fri Nov 13 11:39:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Hai X-Patchwork-Id: 1399719 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CXcZt3FDwz9sWN for ; Fri, 13 Nov 2020 23:04:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726939AbgKMMEA (ORCPT ); Fri, 13 Nov 2020 07:04:00 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:8082 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726569AbgKMLjh (ORCPT ); Fri, 13 Nov 2020 06:39:37 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CXbz15ffvzLxwk; Fri, 13 Nov 2020 19:36:45 +0800 (CST) Received: from huawei.com (10.175.113.133) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Fri, 13 Nov 2020 19:36:55 +0800 From: Wang Hai To: , , , , CC: , , Subject: [PATCH net] Bluetooth: Fix potential null pointer dereference in create_le_conn_complete Date: Fri, 13 Nov 2020 19:39:56 +0800 Message-ID: <20201113113956.52187-1-wanghai38@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.133] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The pointer 'conn' may be null. Before being used by hci_connect_le_scan_cleanup(), The pointer 'conn' must be checked whether it is null. Fixes: 28a667c9c279 ("Bluetooth: advertisement handling in new connect procedure") Reported-by: Hulk Robot Signed-off-by: Wang Hai --- net/bluetooth/hci_conn.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index d0c1024bf600..6ca402c90ee1 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -757,6 +757,8 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode) hci_dev_lock(hdev); conn = hci_lookup_le_connect(hdev); + if (!conn) + goto done; if (!status) { hci_connect_le_scan_cleanup(conn); @@ -766,9 +768,6 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode) bt_dev_err(hdev, "request failed to create LE connection: " "status 0x%2.2x", status); - if (!conn) - goto done; - hci_le_conn_failed(conn, status); done: