Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: Fix crash when using new BT_PHY option

Browse Source 
This fixes the invalid check for connected socket which causes the
following trace due to sco_pi(sk)->conn being NULL:

RIP: 0010:sco_sock_getsockopt+0x2ff/0x800 net/bluetooth/sco.c:966

L2CAP has also been fixed since it has the same problem.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Luiz Augusto von Dentz 2020-02-18 10:33:20 -08:00 committed by Marcel Holtmann
parent 0830c0a489
commit a2a8b0b4ad
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bluetooth/l2cap_sock.c
View File

@ -605,7 +605,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
break;
case BT_PHY:
if (sk->sk_state == BT_CONNECTED) {
if (sk->sk_state != BT_CONNECTED) {
err = -ENOTCONN;
break;
}

2
net/bluetooth/sco.c
View File

@ -958,7 +958,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,
break;
case BT_PHY:
if (sk->sk_state == BT_CONNECTED) {
if (sk->sk_state != BT_CONNECTED) {
err = -ENOTCONN;
break;
}