Bluetooth: Don't try to reject failed LE connections

The check for the blacklist in hci_le_conn_complete_evt() should be when
we know that we have an actual successful connection (ev->status being
non-zero). This patch fixes this ordering.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index bf2926b2e4a95d3c866713f36b2036c466ab6d91..68d335e193bf86fc03aac5bd84c77d2d54555860 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4187,14 +4187,14 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
        else
                addr_type = BDADDR_LE_RANDOM;
 
-       /* Drop the connection if he device is blocked */
-       if (hci_bdaddr_list_lookup(&hdev->blacklist, &conn->dst, addr_type)) {
-               hci_conn_drop(conn);
+       if (ev->status) {
+               hci_le_conn_failed(conn, ev->status);
                goto unlock;
        }
 
-       if (ev->status) {
-               hci_le_conn_failed(conn, ev->status);
+       /* Drop the connection if the device is blocked */
+       if (hci_bdaddr_list_lookup(&hdev->blacklist, &conn->dst, addr_type)) {
+               hci_conn_drop(conn);
                goto unlock;
        }