Commit f6b7712e authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Send global configuration updates to all management users 



Changes to the global configuration updates like settings, class of
device, name etc. can be received by every user. They are allowed to
read them in the first place so provide the updates via events as
well. Otherwise untrusted users start polling for updates and that
is not a desired behavior.

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

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ enum { 
	HCI_MGMT_INDEX_EVENTS,

	HCI_MGMT_UNCONF_INDEX_EVENTS,

	HCI_MGMT_EXT_INDEX_EVENTS,

	HCI_MGMT_GENERIC_EVENTS,

};



/*

net/bluetooth/hci_sock.c

+5 −0
Original line number Diff line number Diff line
@@ -808,10 +808,15 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 
		 * socket when binding keeps this functionality. They

		 * however might be cleared later and then sending of these

		 * events will be disabled, but that is then intentional.

		 *

		 * This also enables generic events that are safe to be

		 * received by untrusted users. Example for such events

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

		 */

		if (haddr.hci_channel == HCI_CHANNEL_CONTROL) {

			hci_sock_set_flag(sk, HCI_MGMT_INDEX_EVENTS);

			hci_sock_set_flag(sk, HCI_MGMT_UNCONF_INDEX_EVENTS);

			hci_sock_set_flag(sk, HCI_MGMT_GENERIC_EVENTS);

		}

		break;

	}

net/bluetooth/mgmt.c

+20 −14
Original line number Diff line number Diff line
@@ -260,6 +260,13 @@ static int mgmt_index_event(u16 event, struct hci_dev *hdev, void *data, 
			       flag, NULL);

}



static int mgmt_generic_event(u16 event, struct hci_dev *hdev, void *data,

			      u16 len, struct sock *skip_sk)

{

	return mgmt_send_event(event, hdev, HCI_CHANNEL_CONTROL, data, len,

			       HCI_MGMT_GENERIC_EVENTS, skip_sk);

}



static int mgmt_event(u16 event, struct hci_dev *hdev, void *data, u16 len,

		      struct sock *skip_sk)

{
@@ -607,7 +614,7 @@ static int new_options(struct hci_dev *hdev, struct sock *skip) 
{

	__le32 options = get_missing_options(hdev);



	return mgmt_event(MGMT_EV_NEW_CONFIG_OPTIONS, hdev, &options,

	return mgmt_generic_event(MGMT_EV_NEW_CONFIG_OPTIONS, hdev, &options,

				  sizeof(options), skip);

}
@@ -1552,11 +1559,10 @@ failed: 


static int new_settings(struct hci_dev *hdev, struct sock *skip)

{

	__le32 ev;

	__le32 ev = cpu_to_le32(get_current_settings(hdev));



	ev = cpu_to_le32(get_current_settings(hdev));



	return mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), skip);

	return mgmt_generic_event(MGMT_EV_NEW_SETTINGS, hdev, &ev,

				  sizeof(ev), skip);

}



int mgmt_new_settings(struct hci_dev *hdev)
@@ -3677,8 +3683,8 @@ static int set_local_name(struct sock *sk, struct hci_dev *hdev, void *data, 
		if (err < 0)

			goto failed;



		err = mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, data, len,

				 sk);

		err = mgmt_generic_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev,

					 data, len, sk);



		goto failed;

	}
@@ -6673,7 +6679,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered) 
	mgmt_pending_foreach(0, hdev, cmd_complete_rsp, &status);



	if (memcmp(hdev->dev_class, zero_cod, sizeof(zero_cod)) != 0)

		mgmt_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev,

		mgmt_generic_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev,

				   zero_cod, sizeof(zero_cod), NULL);



new_settings:
@@ -7325,8 +7331,8 @@ void mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class, 
	mgmt_pending_foreach(MGMT_OP_REMOVE_UUID, hdev, sk_lookup, &match);



	if (!status)

		mgmt_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev, dev_class, 3,

			   NULL);

		mgmt_generic_event(MGMT_EV_CLASS_OF_DEV_CHANGED, hdev,

				   dev_class, 3, NULL);



	if (match.sk)

		sock_put(match.sk);
@@ -7355,7 +7361,7 @@ void mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status) 
			return;

	}



	mgmt_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev),

	mgmt_generic_event(MGMT_EV_LOCAL_NAME_CHANGED, hdev, &ev, sizeof(ev),

			   cmd ? cmd->sk : NULL);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE