lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 181/270] Bluetooth: SMP: Fix setting unknown auth_req bits
    Date
    3.5.7u1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hedberg <johan.hedberg@intel.com>

    commit 065a13e2cc665f6547dc7e8a9d6b6565badf940a upstream.

    When sending a pairing request or response we should not just blindly
    copy the value that the remote device sent. Instead we should at least
    make sure to mask out any unknown bits. This is particularly critical
    from the upcoming LE Secure Connections feature perspective as
    incorrectly indicating support for it (by copying the remote value)
    would cause a failure to pair with devices that support it.

    Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
    Acked-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    net/bluetooth/smp.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
    index 926043c..22fe004 100644
    --- a/net/bluetooth/smp.c
    +++ b/net/bluetooth/smp.c
    @@ -31,6 +31,8 @@

    #define SMP_TIMEOUT msecs_to_jiffies(30000)

    +#define AUTH_REQ_MASK 0x07
    +
    static inline void swap128(u8 src[16], u8 dst[16])
    {
    int i;
    @@ -229,7 +231,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn,
    req->max_key_size = SMP_MAX_ENC_KEY_SIZE;
    req->init_key_dist = 0;
    req->resp_key_dist = dist_keys;
    - req->auth_req = authreq;
    + req->auth_req = (authreq & AUTH_REQ_MASK);
    return;
    }

    @@ -238,7 +240,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn,
    rsp->max_key_size = SMP_MAX_ENC_KEY_SIZE;
    rsp->init_key_dist = 0;
    rsp->resp_key_dist = req->resp_key_dist & dist_keys;
    - rsp->auth_req = authreq;
    + rsp->auth_req = (authreq & AUTH_REQ_MASK);
    }

    static u8 check_enc_key_size(struct l2cap_conn *conn, __u8 max_key_size)
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-11-26 19:01    [W:4.392 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site