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

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

Bluetooth: Fix passkey endianess in user_confirm and notify_passkey 



The passkey_notify and user_confirm functions in mgmt.c were expecting
different endianess for the passkey, leading to a big endian bug and
sparse warning in recently added SMP code. This patch converts both
functions to expect host endianess and do the conversion to little
endian only when assigning to the mgmt event struct.

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

include/net/bluetooth/hci_core.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1236,7 +1236,7 @@ void mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
void mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

void mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

				      u8 status);

				      u8 status);

int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,

int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,

			      u8 link_type, u8 addr_type, __le32 value,

			      u8 link_type, u8 addr_type, u32 value,

			      u8 confirm_hint);

			      u8 confirm_hint);

int mgmt_user_confirm_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

int mgmt_user_confirm_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,

				     u8 link_type, u8 addr_type, u8 status);

				     u8 link_type, u8 addr_type, u8 status);

net/bluetooth/hci_event.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3459,8 +3459,8 @@ static void hci_user_confirm_request_evt(struct hci_dev *hdev, 
	}

	}





confirm:

confirm:

	mgmt_user_confirm_request(hdev, &ev->bdaddr, ACL_LINK, 0, ev->passkey,

	mgmt_user_confirm_request(hdev, &ev->bdaddr, ACL_LINK, 0,

				  confirm_hint);

				  le32_to_cpu(ev->passkey), confirm_hint);





unlock:

unlock:

	hci_dev_unlock(hdev);

	hci_dev_unlock(hdev);

net/bluetooth/mgmt.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -5338,7 +5338,7 @@ void mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr, 
}

}





int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,

int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,

			      u8 link_type, u8 addr_type, __le32 value,

			      u8 link_type, u8 addr_type, u32 value,

			      u8 confirm_hint)

			      u8 confirm_hint)

{

{

	struct mgmt_ev_user_confirm_request ev;

	struct mgmt_ev_user_confirm_request ev;
@@ -5348,7 +5348,7 @@ int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr, 
	bacpy(&ev.addr.bdaddr, bdaddr);

	bacpy(&ev.addr.bdaddr, bdaddr);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);

	ev.addr.type = link_to_bdaddr(link_type, addr_type);

	ev.confirm_hint = confirm_hint;

	ev.confirm_hint = confirm_hint;

	ev.value = value;

	ev.value = cpu_to_le32(value);





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

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

			  NULL);

			  NULL);

net/bluetooth/smp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -425,7 +425,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth, 
	else

	else

		ret = mgmt_user_passkey_notify(hcon->hdev, &hcon->dst,

		ret = mgmt_user_passkey_notify(hcon->hdev, &hcon->dst,

						hcon->type, hcon->dst_type,

						hcon->type, hcon->dst_type,

						cpu_to_le32(passkey), 0);

						passkey, 0);





	hci_dev_unlock(hcon->hdev);

	hci_dev_unlock(hcon->hdev);