diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-11 23:16:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-11 23:16:07 +0200 |
| commit | 28eaad7504d2ca1c833299ebf5148671638732f9 (patch) | |
| tree | 0c35441dfbd57d9a34759eaa3de85da1e6febd85 /net | |
| parent | net: fs_enet: mask interrupts for TX partial frames. (diff) | |
| parent | Bluetooth: fix MGMT_EV_NEW_LONG_TERM_KEY event (diff) | |
| download | linux-28eaad7504d2ca1c833299ebf5148671638732f9.tar.xz linux-28eaad7504d2ca1c833299ebf5148671638732f9.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
pull request: bluetooth 2015-08-11
Here's an important regression fix for the 4.2-rc series that ensures
user space isn't given invalid LTK values. The bug essentially prevents
the encryption of subsequent LE connections, i.e. makes it impossible to
pair devices over LE.
Let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 7998fb279165..92720f3fe573 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -7820,7 +7820,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent) /* Make sure we copy only the significant bytes based on the * encryption key size, and set the rest of the value to zeroes. */ - memcpy(ev.key.val, key->val, sizeof(key->enc_size)); + memcpy(ev.key.val, key->val, key->enc_size); memset(ev.key.val + key->enc_size, 0, sizeof(ev.key.val) - key->enc_size); |