Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 255c76014af74165428e7aa16414b857e2bdccf2

Authored by Marcel Holtmann
1 parent 43c2e57f94
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Bluetooth: Don't check encryption for L2CAP raw sockets 

For L2CAP sockets with medium and high security requirement a missing
encryption will enforce the closing of the link. For the L2CAP raw
sockets this is not needed, so skip that check.

This fixes a crash when pairing Bluetooth 2.0 (and earlier) devices
since the L2CAP state machine got confused and then locked up the whole
system.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

net/bluetooth/l2cap.c
Diff comments   View file @ 255c760
... ... @@ -2420,6 +2420,9 @@
2420 2420  
2421 2421 static inline void l2cap_check_encryption(struct sock *sk, u8 encrypt)
2422 2422 {
  2423 + if (sk->sk_type != SOCK_SEQPACKET)
  2424 + return;
  2425 +
2423 2426 if (encrypt == 0x00) {
2424 2427 if (l2cap_pi(sk)->sec_level == BT_SECURITY_MEDIUM) {
2425 2428 l2cap_sock_clear_timer(sk);