From: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
To: Johan Hedberg <johan.hedberg@gmail.com>, <padovan@profusion.mobi>
Cc: <linux-bluetooth@vger.kernel.org>,
Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Subject: [PATCH v3 6/7] Bluetooth: Respect local MITM req in io_cap reply
Date: Thu, 28 Apr 2011 12:07:58 +0200 [thread overview]
Message-ID: <1303985279-3944-7-git-send-email-waldemar.rymarkiewicz@tieto.com> (raw)
In-Reply-To: <1303985279-3944-1-git-send-email-waldemar.rymarkiewicz@tieto.com>
If host requires MITM protection notify that to controller in
io capabilities reply even if the remote device requires no bonding.
If it is not respected, host can get an unauthenticated link key while
it expects authenticated one.
Signed-off-by: Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
---
net/bluetooth/hci_event.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 40e96cd..9d50e90 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -2397,7 +2397,7 @@ static inline u8 hci_get_auth_req(struct hci_conn *conn)
/* If remote requests no-bonding follow that lead */
if (conn->remote_auth == 0x00 || conn->remote_auth == 0x01)
- return 0x00;
+ return conn->remote_auth | (conn->auth_type & 0x01);
return conn->auth_type;
}
--
1.7.1
next prev parent reply other threads:[~2011-04-28 10:07 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 10:07 [PATCH v3 0/7] Handle link key type and security requirements Waldemar Rymarkiewicz
2011-04-28 10:07 ` [PATCH v3 1/7] Bluetooth: Add definitions for link key types Waldemar Rymarkiewicz
2011-04-28 10:07 ` [PATCH v3 2/7] Bluetooth: Don't modify sec_level if auth failed Waldemar Rymarkiewicz
2011-04-28 10:07 ` [PATCH v3 3/7] Bluetooth: Map sec_level to link key requirements Waldemar Rymarkiewicz
2011-04-28 10:07 ` [PATCH v3 4/7] Bluetooth: Ignore key unauthenticated for high security Waldemar Rymarkiewicz
2011-04-28 10:07 ` [PATCH v3 5/7] Bluetooth: Double check sec req for pre 2.1 device Waldemar Rymarkiewicz
2011-04-28 18:09 ` Gustavo F. Padovan
2011-04-29 8:23 ` Waldemar.Rymarkiewicz
2011-04-28 18:11 ` Johan Hedberg
2011-04-28 21:08 ` Johan Hedberg
2011-04-29 8:30 ` Waldemar.Rymarkiewicz
2011-04-29 8:10 ` Waldemar.Rymarkiewicz
2011-04-28 10:07 ` Waldemar Rymarkiewicz [this message]
2011-04-28 10:07 ` [PATCH v3 7/7] Bluetooth: Add secure flag for mgmt_pin_code_req Waldemar Rymarkiewicz
2011-04-28 18:34 ` Gustavo F. Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303985279-3944-7-git-send-email-waldemar.rymarkiewicz@tieto.com \
--to=waldemar.rymarkiewicz@tieto.com \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=padovan@profusion.mobi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox