Commit fdcc4bec authored Mar 14, 2014 by Johan Hedberg Committed by Marcel Holtmann Mar 14, 2014

Bluetooth: Fix updating SMP remote key distribution information



When performing pairing using SMP the remote may clear any key
distribution bits it wants in its pairing response. We must therefore
update our local variable accordingly, otherwise we might get stuck
waiting for keys that will never come.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 52d3ef5c

net/bluetooth/smp.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -748,6 +748,11 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn conn, struct sk_buff skb)
		smp->prsp[0] = SMP_CMD_PAIRING_RSP;
		memcpy(&smp->prsp[1], rsp, sizeof(*rsp));

		/* Update remote key distribution in case the remote cleared
		* some bits that we had enabled in our request.
		*/
		smp->remote_key_dist &= rsp->resp_key_dist;

		if ((req->auth_req & SMP_AUTH_BONDING) &&
		(rsp->auth_req & SMP_AUTH_BONDING))
		auth = SMP_AUTH_BONDING;