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

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

Bluteooth: Reject SMP bonding if HCI_PAIRABLE is not set 



If the remote device tries to initiate bonding with us and we don't have
HCI_PAIRABLE set we should just flat out reject the request. This brings
SMP in line with how the flag is used for BR/EDR SSP.

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

net/bluetooth/smp.c

+9 −0
Original line number Diff line number Diff line
@@ -676,6 +676,7 @@ int smp_user_confirm_reply(struct hci_conn *hcon, u16 mgmt_op, __le32 passkey) 
static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)

{

	struct smp_cmd_pairing rsp, *req = (void *) skb->data;

	struct hci_dev *hdev = conn->hcon->hdev;

	struct smp_chan *smp;

	u8 key_size, auth, sec_level;

	int ret;
@@ -696,6 +697,10 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) 
	if (!smp)

		return SMP_UNSPECIFIED;



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

	    (req->auth_req & SMP_AUTH_BONDING))

		return SMP_PAIRING_NOTSUPP;



	smp->preq[0] = SMP_CMD_PAIRING_REQ;

	memcpy(&smp->preq[1], req, sizeof(*req));

	skb_pull(skb, sizeof(*req));
@@ -911,6 +916,10 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) 
	if (test_and_set_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags))

		return 0;



	if (!test_bit(HCI_PAIRABLE, &hcon->hdev->dev_flags) &&

	    (rp->auth_req & SMP_AUTH_BONDING))

		return SMP_PAIRING_NOTSUPP;



	smp = smp_chan_create(conn);

	if (!smp)

		return SMP_UNSPECIFIED;