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

Commit 55bc1a37 authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: Add confirm_hint parameter to user confirmation requests 



When accepting a pairing request which fulfills the SSP auto-accept
criteria we need to push the request all the way to the user for
confirmation. This patch adds a new hint to the user_confirm_request
management event so user space can know when to show a numeric
comparison dialog and when to show a simple yes/no confirmation dialog.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 79c6c70c

include/net/bluetooth/hci_core.h

+2 −1
Original line number Diff line number Diff line
@@ -783,7 +783,8 @@ int mgmt_connect_failed(u16 index, bdaddr_t *bdaddr, u8 status); 
int mgmt_pin_code_request(u16 index, bdaddr_t *bdaddr, u8 secure);

int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);

int mgmt_pin_code_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);

int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value);

int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value,

							u8 confirm_hint);

int mgmt_user_confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);

int mgmt_user_confirm_neg_reply_complete(u16 index, bdaddr_t *bdaddr,

								u8 status);

include/net/bluetooth/mgmt.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ struct mgmt_ev_pin_code_request { 
#define MGMT_EV_USER_CONFIRM_REQUEST	0x000F

struct mgmt_ev_user_confirm_request {

	bdaddr_t bdaddr;

	__u8 confirm_hint;

	__le32 value;

} __packed;

net/bluetooth/hci_event.c

+14 −2
Original line number Diff line number Diff line
@@ -2497,7 +2497,7 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev, 
							struct sk_buff *skb)

{

	struct hci_ev_user_confirm_req *ev = (void *) skb->data;

	int loc_mitm, rem_mitm;

	int loc_mitm, rem_mitm, confirm_hint = 0;

	struct hci_conn *conn;



	BT_DBG("%s", hdev->name);
@@ -2529,6 +2529,16 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev, 
	/* If no side requires MITM protection; auto-accept */

	if ((!loc_mitm || conn->remote_cap == 0x03) &&

				(!rem_mitm || conn->io_capability == 0x03)) {



		/* If we're not the initiators request authorization to

		 * proceed from user space (mgmt_user_confirm with

		 * confirm_hint set to 1). */

		if (!test_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {

			BT_DBG("Confirming auto-accept as acceptor");

			confirm_hint = 1;

			goto confirm;

		}



		BT_DBG("Auto-accept of user confirmation with %ums delay",

						hdev->auto_accept_delay);
@@ -2543,7 +2553,9 @@ static inline void hci_user_confirm_request_evt(struct hci_dev *hdev, 
		goto unlock;

	}



	mgmt_user_confirm_request(hdev->id, &ev->bdaddr, ev->passkey);

confirm:

	mgmt_user_confirm_request(hdev->id, &ev->bdaddr, ev->passkey,

								confirm_hint);



unlock:

	hci_dev_unlock(hdev);

net/bluetooth/mgmt.c

+3 −1
Original line number Diff line number Diff line
@@ -1995,13 +1995,15 @@ int mgmt_pin_code_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status) 
	return err;

}



int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value)

int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value,

							u8 confirm_hint)

{

	struct mgmt_ev_user_confirm_request ev;



	BT_DBG("hci%u", index);



	bacpy(&ev.bdaddr, bdaddr);

	ev.confirm_hint = confirm_hint;

	put_unaligned_le32(value, &ev.value);



	return mgmt_event(MGMT_EV_USER_CONFIRM_REQUEST, index, &ev, sizeof(ev),