summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-05-30 14:45:19 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-05-30 21:25:01 -0700
commit7e3691e13ab51f3491e996e2edaf99b173621288 (patch)
treea211a6b26099a306c0058246fe17f777412154b8 /net
parent61b433579b6ffecb1d3534fd482dcd48535277c8 (diff)
downloadlinux-7e3691e13ab51f3491e996e2edaf99b173621288.tar.gz
linux-7e3691e13ab51f3491e996e2edaf99b173621288.tar.bz2
linux-7e3691e13ab51f3491e996e2edaf99b173621288.zip
Bluetooth: Fix authentication check for FIPS security level
When checking whether we need to request authentication or not we should include HCI_SECURITY_FIPS to the levels that always need authentication. This patch fixes check for it in the hci_outgoing_auth_needed() function. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_event.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 492d8d5071c7..6cf9596ff69b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1453,6 +1453,7 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
* is requested.
*/
if (!hci_conn_ssp_enabled(conn) && !(conn->auth_type & 0x01) &&
+ conn->pending_sec_level != BT_SECURITY_FIPS &&
conn->pending_sec_level != BT_SECURITY_HIGH &&
conn->pending_sec_level != BT_SECURITY_MEDIUM)
return 0;