Bluetooth: Set security level on incoming pairing request
authorIdo Yariv <ido@wizery.com>
Mon, 5 Mar 2012 18:09:38 +0000 (20:09 +0200)
committerGustavo F. Padovan <padovan@profusion.mobi>
Thu, 8 Mar 2012 05:26:04 +0000 (02:26 -0300)
If a master would like to raise the security level, it will send a
pairing request. While the pending security level is set on an incoming
security request (from a slave), it is not set on a pairing request. As
a result, the security level would not be raised on the slave in such
case.

Fix this by setting the pending security when receiving pairing
requests according to the requested authorization.

Signed-off-by: Ido Yariv <ido@wizery.com>
Acked-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
net/bluetooth/smp.c

index 9883d67..deb1198 100644 (file)
@@ -589,6 +589,8 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
        if (req->auth_req & SMP_AUTH_BONDING)
                auth = req->auth_req;
 
+       conn->hcon->pending_sec_level = authreq_to_seclevel(auth);
+
        build_pairing_cmd(conn, req, &rsp, auth);
 
        key_size = min(req->max_key_size, rsp.max_key_size);