diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-06-02 10:12:44 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-06-02 00:34:36 -0700 |
| commit | f3fb0b58c85666f73139963a7a04d7878f3d22c9 (patch) | |
| tree | fbbc0f1ac6cf5df387581275d0eb026f7a3eb88b /net/bluetooth | |
| parent | 79897d2097a629179e142014ecd3cdce6eac7f0e (diff) | |
| download | blackbird-obmc-linux-f3fb0b58c85666f73139963a7a04d7878f3d22c9.tar.gz blackbird-obmc-linux-f3fb0b58c85666f73139963a7a04d7878f3d22c9.zip | |
Bluetooth: Fix missing check for FIPS security level
When checking whether a legacy link key provides at least HIGH security
level we also need to check for FIPS level which is one step above HIGH.
This patch fixes a missing check in the hci_link_key_request_evt()
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/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 6cf9596ff69b..df7895e8fcc8 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3077,7 +3077,8 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb) } if (key->type == HCI_LK_COMBINATION && key->pin_len < 16 && - conn->pending_sec_level == BT_SECURITY_HIGH) { + (conn->pending_sec_level == BT_SECURITY_HIGH || + conn->pending_sec_level == BT_SECURITY_FIPS)) { BT_DBG("%s ignoring key unauthenticated for high security", hdev->name); goto not_found; |
