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

Commit e2dcd113 authored by Vinicius Costa Gomes's avatar Vinicius Costa Gomes Committed by Gustavo Padovan
Browse files

Bluetooth: Reset the security timer when a command is queued 



Each time a SMP command is enqueued, we reset the SMP timer,
this way we follow exactly what the spec mandates:

"The Security Manager Timer shall be reset when an L2CAP SMP command is
queued for transmission." Vol. 3, Part H, Section 3.4

Signed-off-by: default avatarVinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 52087a79

net/bluetooth/smp.c

+3 −12
Original line number Original line Diff line number Diff line
@@ -182,6 +182,9 @@ static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data) 
		return;

		return;





	hci_send_acl(conn->hcon, skb, 0);

	hci_send_acl(conn->hcon, skb, 0);



	mod_timer(&conn->security_timer, jiffies +

					msecs_to_jiffies(SMP_TIMEOUT));

}

}





static __u8 seclevel_to_authreq(__u8 level)

static __u8 seclevel_to_authreq(__u8 level)
@@ -267,9 +270,6 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) 




	smp_send_cmd(conn, SMP_CMD_PAIRING_RSP, sizeof(rsp), &rsp);

	smp_send_cmd(conn, SMP_CMD_PAIRING_RSP, sizeof(rsp), &rsp);





	mod_timer(&conn->security_timer, jiffies +

					msecs_to_jiffies(SMP_TIMEOUT));



	return 0;

	return 0;

}

}
@@ -351,9 +351,6 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb) 
		smp_send_cmd(conn, SMP_CMD_PAIRING_CONFIRM, sizeof(cp), &cp);

		smp_send_cmd(conn, SMP_CMD_PAIRING_CONFIRM, sizeof(cp), &cp);

	}

	}





	mod_timer(&conn->security_timer, jiffies +

					msecs_to_jiffies(SMP_TIMEOUT));



	return 0;

	return 0;

}

}
@@ -446,9 +443,6 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) 




	smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp);

	smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp);





	mod_timer(&conn->security_timer, jiffies +

					msecs_to_jiffies(SMP_TIMEOUT));



	set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->pend);

	set_bit(HCI_CONN_ENCRYPT_PEND, &hcon->pend);





	return 0;

	return 0;
@@ -498,9 +492,6 @@ int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level) 
		conn->preq[0] = SMP_CMD_PAIRING_REQ;

		conn->preq[0] = SMP_CMD_PAIRING_REQ;

		memcpy(&conn->preq[1], &cp, sizeof(cp));

		memcpy(&conn->preq[1], &cp, sizeof(cp));





		mod_timer(&conn->security_timer, jiffies +

					msecs_to_jiffies(SMP_TIMEOUT));



		smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp);

		smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp);

	} else {

	} else {

		struct smp_cmd_security_req cp;

		struct smp_cmd_security_req cp;