Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

2013-11-15 14:18:45 -05:00
parent 8e3ffa4710 86ca9eac31
commit 32019c739c
4 changed files with 14 additions and 1 deletions
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -742,6 +742,9 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb)

 	BT_DBG("conn %p", conn);

+	if (!(conn->hcon->link_mode & HCI_LM_MASTER))
+		return SMP_CMD_NOTSUPP;
+
 	hcon->pending_sec_level = authreq_to_seclevel(rp->auth_req);

 	if (smp_ltk_encrypt(conn, hcon->pending_sec_level))