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

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

Bluetooth: Always use non-bonding requirement when not bondable 



When we're not bondable we should never send any other SSP
authentication requirement besides one of the non-bonding ones.

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

net/bluetooth/hci_event.c

+8 −3
Original line number Diff line number Diff line
@@ -3671,13 +3671,18 @@ static void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
			if (conn->io_capability != HCI_IO_NO_INPUT_OUTPUT &&

			    conn->auth_type != HCI_AT_NO_BONDING)

				conn->auth_type |= 0x01;



			cp.authentication = conn->auth_type;

		} else {

			conn->auth_type = hci_get_auth_req(conn);

			cp.authentication = conn->auth_type;

		}



		/* If we're not bondable, force one of the non-bondable

		 * authentication requirement values.

		 */

		if (!test_bit(HCI_BONDABLE, &hdev->dev_flags))

			conn->auth_type &= HCI_AT_NO_BONDING_MITM;



		cp.authentication = conn->auth_type;



		if (hci_find_remote_oob_data(hdev, &conn->dst) &&

		    (conn->out || test_bit(HCI_CONN_REMOTE_OOB, &conn->flags)))

			cp.oob_data = 0x01;