lkml.org 
[lkml]   [2014]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 085/139] Bluetooth: Fix requiring SMP MITM for outgoing connections
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 79897d2097a629179e142014ecd3cdce6eac7f0e upstream.

    Due to recent changes to the way that the MITM requirement is set for
    outgoing pairing attempts we can no longer rely on the hcon->auth_type
    variable (which is actually good since it was formed from BR/EDR
    concepts that don't really exist for SMP).

    To match the logic that BR/EDR now uses simply rely on the local IO
    capability and/or needed security level to set the MITM requirement for
    outgoing pairing requests.

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

    ---
    net/bluetooth/smp.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/net/bluetooth/smp.c
    +++ b/net/bluetooth/smp.c
    @@ -908,10 +908,11 @@ int smp_conn_security(struct hci_conn *h

    authreq = seclevel_to_authreq(sec_level);

    - /* hcon->auth_type is set by pair_device in mgmt.c. If the MITM
    - * flag is set we should also set it for the SMP request.
    + /* Require MITM if IO Capability allows or the security level
    + * requires it.
    */
    - if ((hcon->auth_type & 0x01))
    + if (hcon->io_capability != HCI_IO_NO_INPUT_OUTPUT ||
    + sec_level > BT_SECURITY_MEDIUM)
    authreq |= SMP_AUTH_MITM;

    if (hcon->link_mode & HCI_LM_MASTER) {



    \
     
     \ /
      Last update: 2014-06-28 21:21    [W:2.489 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site