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

Commit 6fd6b915 authored by Mikel Astiz's avatar Mikel Astiz Committed by Johan Hedberg
Browse files

Bluetooth: Refactor code for outgoing dedicated bonding 



Do not always set the MITM protection requirement by default in the
field conn->auth_type, since this will be added later in
hci_io_capa_request_evt(), as part of the requirements specified in
HCI_OP_IO_CAPABILITY_REPLY.

This avoids a hackish exception for the auto-reject case, but doesn't
change the behavior of the code at all.

Signed-off-by: default avatarMikel Astiz <mikel.astiz@bmw-carit.de>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent b7f94c88

net/bluetooth/hci_event.c

+8 −6
Original line number Diff line number Diff line
@@ -3471,6 +3471,11 @@ static void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
		/* If we are initiators, there is no remote information yet */

		if (conn->remote_auth == 0xff) {

			cp.authentication = conn->auth_type;



			/* Use MITM protection for outgoing dedicated bonding */

			if (conn->io_capability != HCI_IO_NO_INPUT_OUTPUT &&

			    cp.authentication == HCI_AT_DEDICATED_BONDING)

				cp.authentication |= 0x01;

		} else {

			conn->auth_type = hci_get_auth_req(conn);

			cp.authentication = conn->auth_type;
@@ -3542,12 +3547,9 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, 
	rem_mitm = (conn->remote_auth & 0x01);



	/* If we require MITM but the remote device can't provide that

	 * (it has NoInputNoOutput) then reject the confirmation

	 * request. The only exception is when we're dedicated bonding

	 * initiators (connect_cfm_cb set) since then we always have the MITM

	 * bit set. */

	if (!conn->connect_cfm_cb && loc_mitm &&

	    conn->remote_cap == HCI_IO_NO_INPUT_OUTPUT) {

	 * (it has NoInputNoOutput) then reject the confirmation request

	 */

	if (loc_mitm && conn->remote_cap == HCI_IO_NO_INPUT_OUTPUT) {

		BT_DBG("Rejecting request: remote device can't provide MITM");

		hci_send_cmd(hdev, HCI_OP_USER_CONFIRM_NEG_REPLY,

			     sizeof(ev->bdaddr), &ev->bdaddr);

net/bluetooth/mgmt.c

+1 −4
Original line number Diff line number Diff line
@@ -2850,10 +2850,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
	}



	sec_level = BT_SECURITY_MEDIUM;

	if (cp->io_cap == 0x03)

	auth_type = HCI_AT_DEDICATED_BONDING;

	else

		auth_type = HCI_AT_DEDICATED_BONDING_MITM;



	if (cp->addr.type == BDADDR_BREDR) {

		conn = hci_connect_acl(hdev, &cp->addr.bdaddr, sec_level,