pull request: bluetooth 2014-06-13

[Gustavo Padovan]

Hi John,

This is our first batch of fixes for 3.16. Be aware that two patches here
are not exactly bugfixes:

* 71f28af57066 Bluetooth: Add clarifying comment for conn->auth_type
This commit just add some important security comments to the code, we found
it important enough to include it here for 3.16 since it is security related.

* 9f7ec8871132 Bluetooth: Refactor discovery stopping into its own function
This commit is just a refactor in a preparation for a fix in the next
commit (f8680f128b).

All the other patches are fixes for deadlocks and for the Bluetooth protocols,
most of them related to authentication and encryption

This is rebased on net.git of yesterday, so we need you to pull it first and then
pull from us. This rebase was necessary for us.

Please pull or let me know of any concerns you may have. Thanks!

	Gustavo

---
The following changes since commit f9da455b93f6ba076935b4ef4589f61e529ae046:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (2014-06-12 14:27:40 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git for-upstream

for you to fetch changes up to 92d1372e1a9fec00e146b74e8b9ad7a385b9b37f:

  Bluetooth: Allow change security level on ATT_CID in slave role (2014-06-13 14:36:39 +0200)

----------------------------------------------------------------
Johan Hedberg (9):
      Bluetooth: Fix incorrectly overriding conn->src_type
      Bluetooth: Fix check for connection encryption
      Bluetooth: Fix SSP acceptor just-works confirmation without MITM
      Bluetooth: Add clarifying comment for conn->auth_type
      Bluetooth: Fix setting correct authentication information for SMP STK
      Bluetooth: Fix indicating discovery state when canceling inquiry
      Bluetooth: Refactor discovery stopping into its own function
      Bluetooth: Reuse hci_stop_discovery function when cleaning up HCI state
      Bluetooth: Fix locking of hdev when calling into SMP code

Jukka Taimisto (1):
      Bluetooth: Fix deadlock in l2cap_conn_del()

Marcin Kraglak (1):
      Bluetooth: Allow change security level on ATT_CID in slave role

 net/bluetooth/hci_conn.c   |   7 +---
 net/bluetooth/hci_event.c  |  17 ++++++++--
 net/bluetooth/l2cap_core.c |   8 ++++-
 net/bluetooth/l2cap_sock.c |   5 ---
 net/bluetooth/mgmt.c       | 104 ++++++++++++++++++++++++++++++++----------------------------
 net/bluetooth/smp.c        |   9 ++++--
 6 files changed, 85 insertions(+), 65 deletions(-)

Attachment: pgp_ABVfVFeZp.pgp
Description: PGP signature