Commit c15cd642 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'for-net-2023-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth 



bluetooth pull request for net:

 - Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER
 - Fix handling of listen for ISO unicast
 - Fix build warnings
 - Fix leaking content of local_codecs
 - Add shutdown function for QCA6174
 - Delete unused hci_req_prepare_suspend() declaration
 - Fix hci_link_tx_to RCU lock usage
 - Avoid redundant authentication

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6b09edc1 b938790e

drivers/bluetooth/btusb.c

+1 −0
Original line number Diff line number Diff line
@@ -4419,6 +4419,7 @@ static int btusb_probe(struct usb_interface *intf, 


	if (id->driver_info & BTUSB_QCA_ROME) {

		data->setup_on_usb = btusb_setup_qca;

		hdev->shutdown = btusb_shutdown_qca;

		hdev->set_bdaddr = btusb_set_bdaddr_ath3012;

		hdev->cmd_timeout = btusb_qca_cmd_timeout;

		set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ struct hci_dev { 
	struct list_head list;

	struct mutex	lock;



	char		name[8];

	const char	*name;

	unsigned long	flags;

	__u16		id;

	__u8		bus;

net/bluetooth/hci_conn.c

+35 −28
Original line number Diff line number Diff line
@@ -2413,34 +2413,41 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type, 
	if (!test_bit(HCI_CONN_AUTH, &conn->flags))

		goto auth;



	/* An authenticated FIPS approved combination key has sufficient

	 * security for security level 4. */

	if (conn->key_type == HCI_LK_AUTH_COMBINATION_P256 &&

	    sec_level == BT_SECURITY_FIPS)

	switch (conn->key_type) {

	case HCI_LK_AUTH_COMBINATION_P256:

		/* An authenticated FIPS approved combination key has

		 * sufficient security for security level 4 or lower.

		 */

		if (sec_level <= BT_SECURITY_FIPS)

			goto encrypt;



		break;

	case HCI_LK_AUTH_COMBINATION_P192:

		/* An authenticated combination key has sufficient security for

	   security level 3. */

	if ((conn->key_type == HCI_LK_AUTH_COMBINATION_P192 ||

	     conn->key_type == HCI_LK_AUTH_COMBINATION_P256) &&

	    sec_level == BT_SECURITY_HIGH)

		 * security level 3 or lower.

		 */

		if (sec_level <= BT_SECURITY_HIGH)

			goto encrypt;



	/* An unauthenticated combination key has sufficient security for

	   security level 1 and 2. */

	if ((conn->key_type == HCI_LK_UNAUTH_COMBINATION_P192 ||

	     conn->key_type == HCI_LK_UNAUTH_COMBINATION_P256) &&

	    (sec_level == BT_SECURITY_MEDIUM || sec_level == BT_SECURITY_LOW))

		break;

	case HCI_LK_UNAUTH_COMBINATION_P192:

	case HCI_LK_UNAUTH_COMBINATION_P256:

		/* An unauthenticated combination key has sufficient security

		 * for security level 2 or lower.

		 */

		if (sec_level <= BT_SECURITY_MEDIUM)

			goto encrypt;



	/* A combination key has always sufficient security for the security

	   levels 1 or 2. High security level requires the combination key

	   is generated using maximum PIN code length (16).

	   For pre 2.1 units. */

	if (conn->key_type == HCI_LK_COMBINATION &&

	    (sec_level == BT_SECURITY_MEDIUM || sec_level == BT_SECURITY_LOW ||

	     conn->pin_length == 16))

		break;

	case HCI_LK_COMBINATION:

		/* A combination key has always sufficient security for the

		 * security levels 2 or lower. High security level requires the

		 * combination key is generated using maximum PIN code length

		 * (16). For pre 2.1 units.

		 */

		if (sec_level <= BT_SECURITY_MEDIUM || conn->pin_length == 16)

			goto encrypt;

		break;

	default:

		break;

	}



auth:

	if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags))

net/bluetooth/hci_core.c

+11 −3
Original line number Diff line number Diff line
@@ -2617,7 +2617,11 @@ int hci_register_dev(struct hci_dev *hdev) 
	if (id < 0)

		return id;



	snprintf(hdev->name, sizeof(hdev->name), "hci%d", id);

	error = dev_set_name(&hdev->dev, "hci%u", id);

	if (error)

		return error;



	hdev->name = dev_name(&hdev->dev);

	hdev->id = id;



	BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
@@ -2639,8 +2643,6 @@ int hci_register_dev(struct hci_dev *hdev) 
	if (!IS_ERR_OR_NULL(bt_debugfs))

		hdev->debugfs = debugfs_create_dir(hdev->name, bt_debugfs);



	dev_set_name(&hdev->dev, "%s", hdev->name);



	error = device_add(&hdev->dev);

	if (error < 0)

		goto err_wqueue;
@@ -2784,6 +2786,7 @@ void hci_release_dev(struct hci_dev *hdev) 
	hci_conn_params_clear_all(hdev);

	hci_discovery_filter_clear(hdev);

	hci_blocked_keys_clear(hdev);

	hci_codec_list_clear(&hdev->local_codecs);

	hci_dev_unlock(hdev);



	ida_simple_remove(&hci_index_ida, hdev->id);
@@ -3418,7 +3421,12 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type) 
		if (c->type == type && c->sent) {

			bt_dev_err(hdev, "killing stalled connection %pMR",

				   &c->dst);

			/* hci_disconnect might sleep, so, we have to release

			 * the RCU read lock before calling it.

			 */

			rcu_read_unlock();

			hci_disconnect(c, HCI_ERROR_REMOTE_USER_TERM);

			rcu_read_lock();

		}

	}

net/bluetooth/hci_event.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include "hci_request.h"

#include "hci_debugfs.h"

#include "hci_codec.h"

#include "a2mp.h"

#include "amp.h"

#include "smp.h"