UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
David S. Miller 2015-08-11 14:16:07 -07:00
parent c68875fa82 cb92205bad
commit 28eaad7504
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bluetooth/mgmt.c
View File

@ -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 /* Make sure we copy only the significant bytes based on the
* encryption key size, and set the rest of the value to zeroes. * 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, memset(ev.key.val + key->enc_size, 0,
sizeof(ev.key.val) - key->enc_size); sizeof(ev.key.val) - key->enc_size);