From: Johan Hedberg Date: Sun, 1 Jun 2014 06:45:24 +0000 (+0300) Subject: Bluetooth: Fix requiring SMP MITM for outgoing connections X-Git-Tag: v4.14-rc1~7383^2~50^2^2~1^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79897d2097a629179e142014ecd3cdce6eac7f0e;p=platform%2Fkernel%2Flinux-rpi.git Bluetooth: Fix requiring SMP MITM for outgoing connections 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 Signed-off-by: Marcel Holtmann Cc: stable@vger.kernel.org --- diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 4f9662d..3d1cc16 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -909,10 +909,11 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level) 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) {