This is a note to let you know that I've just added the patch titled
Bluetooth: Fix properly ignoring LTKs of unknown types
to the 3.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-fix-properly-ignoring-ltks-of-unknown-types.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 61b433579b6ffecb1d3534fd482dcd48535277c8 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date: Thu, 29 May 2014 19:36:53 +0300
Subject: Bluetooth: Fix properly ignoring LTKs of unknown types
From: Johan Hedberg <johan.hedberg@xxxxxxxxx>
commit 61b433579b6ffecb1d3534fd482dcd48535277c8 upstream.
In case there are new LTK types in the future we shouldn't just blindly
assume that != MGMT_LTK_UNAUTHENTICATED means that the key is
authenticated. This patch adds explicit checks for each allowed key type
in the form of a switch statement and skips any key which has an unknown
value.
Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Signed-off-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/bluetooth/mgmt.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4542,10 +4542,16 @@ static int load_long_term_keys(struct so
else
type = HCI_SMP_LTK_SLAVE;
- if (key->type == MGMT_LTK_UNAUTHENTICATED)
+ switch (key->type) {
+ case MGMT_LTK_UNAUTHENTICATED:
authenticated = 0x00;
- else
+ break;
+ case MGMT_LTK_AUTHENTICATED:
authenticated = 0x01;
+ break;
+ default:
+ continue;
+ }
hci_add_ltk(hdev, &key->addr.bdaddr, addr_type, type,
authenticated, key->val, key->enc_size, key->ediv,
Patches currently in stable-queue which might be from johan.hedberg@xxxxxxxxx are
queue-3.15/bluetooth-fix-l2cap-deadlock.patch
queue-3.15/bluetooth-clearly-distinguish-mgmt-ltk-type-from-authenticated-property.patch
queue-3.15/bluetooth-fix-properly-ignoring-ltks-of-unknown-types.patch
queue-3.15/bluetooth-fix-missing-check-for-fips-security-level.patch
queue-3.15/bluetooth-fix-authentication-check-for-fips-security-level.patch
queue-3.15/bluetooth-fix-requiring-smp-mitm-for-outgoing-connections.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html