Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a6d2cf5 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: Assign the channel early when binding HCI sockets 



Assignment of the hci_pi(sk)->channel should be done early when binding
the HCI socket. This avoids confusion with the RAW channel that is used
for legacy access.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 0ef2c42f

net/bluetooth/hci_sock.c

+11 −5
Original line number Diff line number Diff line
@@ -1045,6 +1045,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
			atomic_inc(&hdev->promisc);

		}



		hci_pi(sk)->channel = haddr.hci_channel;

		hci_pi(sk)->hdev = hdev;

		break;
@@ -1107,9 +1108,10 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
			}

		}



		atomic_inc(&hdev->promisc);



		hci_pi(sk)->channel = haddr.hci_channel;

		hci_pi(sk)->hdev = hdev;



		atomic_inc(&hdev->promisc);

		break;



	case HCI_CHANNEL_MONITOR:
@@ -1123,6 +1125,8 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
			goto done;

		}



		hci_pi(sk)->channel = haddr.hci_channel;



		/* The monitor interface is restricted to CAP_NET_RAW

		 * capabilities and with that implicitly trusted.

		 */
@@ -1149,6 +1153,8 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
			err = -EPERM;

			goto done;

		}



		hci_pi(sk)->channel = haddr.hci_channel;

		break;



	default:
@@ -1170,6 +1176,8 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
		if (capable(CAP_NET_ADMIN))

			hci_sock_set_flag(sk, HCI_SOCK_TRUSTED);



		hci_pi(sk)->channel = haddr.hci_channel;



		/* At the moment the index and unconfigured index events

		 * are enabled unconditionally. Setting them on each

		 * socket when binding keeps this functionality. They
@@ -1180,7 +1188,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
		 * received by untrusted users. Example for such events

		 * are changes to settings, class of device, name etc.

		 */

		if (haddr.hci_channel == HCI_CHANNEL_CONTROL) {

		if (hci_pi(sk)->channel == HCI_CHANNEL_CONTROL) {

			struct sk_buff *skb;



			hci_sock_gen_cookie(sk);
@@ -1203,8 +1211,6 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
		break;

	}





	hci_pi(sk)->channel = haddr.hci_channel;

	sk->sk_state = BT_BOUND;



done: