Skip to contentSkip to conversation

Bluetooth: Fix crash when using new BT_PHY option

PATCH In review Luiz Augusto von Dentz 1 participant 2 messages Feb 20, 2020

Subsystems (2)
lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH 1/1 Bluetooth: Fix crash when using new BT_PHY option

From: Luiz Augusto von Dentz <[email protected]>

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.

---
 net/bluetooth/l2cap_sock.c | 2 +-
 net/bluetooth/sco.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_sock.c +1 -1
index 9fb47b2b13c9..305710446e66 100644
@@ -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;
 		}
net/bluetooth/sco.c +1 -1
index 29ab3e12fb46..c8c3d38cdc7b 100644
@@ -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;
 		}
Signature · 1 line
2.21.1
author maintainer
#1 lore raw

Hi,

Quoted 43 lines · Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

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.

---
 net/bluetooth/l2cap_sock.c | 2 +-
 net/bluetooth/sco.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_sock.c +1 -1
index 9fb47b2b13c9..305710446e66 100644
@@ -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;
                }
net/bluetooth/sco.c +1 -2
index 29ab3e12fb46..c8c3d38cdc7b 100644
@@ -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;
                }
--
Quoted 1 line

2.21.1

Please disregard this one, it was sent by mistake.

Signature · 1 line
Luiz Augusto von Dentz