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

Commit 4f957a76 authored by Brian Gix's avatar Brian Gix Committed by Gustavo Padovan
Browse files

Bluetooth: Centralize SMP pairing failure handling 



Signed-off-by: default avatarBrian Gix <bgix@codeaurora.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent c8eb9690

net/bluetooth/smp.c

+16 −6
Original line number Diff line number Diff line
@@ -232,6 +232,18 @@ static u8 check_enc_key_size(struct l2cap_conn *conn, __u8 max_key_size) 
	return 0;

}



static void smp_failure(struct l2cap_conn *conn, u8 reason, u8 send)

{

	if (send)

		smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, sizeof(reason),

								&reason);



	clear_bit(HCI_CONN_ENCRYPT_PEND, &conn->hcon->pend);

	mgmt_auth_failed(conn->hcon->hdev, conn->dst, reason);

	del_timer(&conn->security_timer);

	smp_chan_destroy(conn);

}



static void confirm_work(struct work_struct *work)

{

	struct smp_chan *smp = container_of(work, struct smp_chan, confirm);
@@ -270,8 +282,7 @@ static void confirm_work(struct work_struct *work) 
	return;



error:

	smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, sizeof(reason), &reason);

	smp_chan_destroy(conn);

	smp_failure(conn, reason, 1);

}



static void random_work(struct work_struct *work)
@@ -354,8 +365,7 @@ static void random_work(struct work_struct *work) 
	return;



error:

	smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, sizeof(reason), &reason);

	smp_chan_destroy(conn);

	smp_failure(conn, reason, 1);

}



static struct smp_chan *smp_chan_create(struct l2cap_conn *conn)
@@ -655,6 +665,7 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb) 
		break;



	case SMP_CMD_PAIRING_FAIL:

		smp_failure(conn, skb->data[0], 0);

		reason = 0;

		err = -EPERM;

		break;
@@ -700,8 +711,7 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb) 


done:

	if (reason)

		smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, sizeof(reason),

								&reason);

		smp_failure(conn, reason, 1);



	kfree_skb(skb);

	return err;