diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-06-10 09:54:24 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 11:14:01 -0700 |
commit | 07f5ed51cb551e89d89766ba87e7313aae53e139 (patch) | |
tree | f0f675a837f85357ed0bb7bb26751566cf59b528 /ipc | |
parent | 6ab84785311dc4d0348e6bd4e1c491293b770b98 (diff) | |
download | linux-3.10-07f5ed51cb551e89d89766ba87e7313aae53e139.tar.gz linux-3.10-07f5ed51cb551e89d89766ba87e7313aae53e139.tar.bz2 linux-3.10-07f5ed51cb551e89d89766ba87e7313aae53e139.zip |
Bluetooth: Fix check for connection encryption
commit e694788d73efe139b24f78b036deb97fe57fa8cb upstream.
The conn->link_key variable tracks the type of link key in use. It is
set whenever we respond to a link key request as well as when we get a
link key notification event.
These two events do not however always guarantee that encryption is
enabled: getting a link key request and responding to it may only mean
that the remote side has requested authentication but not encryption. On
the other hand, the encrypt change event is a certain guarantee that
encryption is enabled. The real encryption state is already tracked in
the conn->link_mode variable through the HCI_LM_ENCRYPT bit.
This patch fixes a check for encryption in the hci_conn_auth function to
use the proper conn->link_mode value and thereby eliminates the chance
of a false positive result.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'ipc')
0 files changed, 0 insertions, 0 deletions