diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-02-18 10:33:20 -0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2020-02-18 22:02:15 +0100 |
| commit | a2a8b0b4adeaec3de5213b7825588352a696df75 (patch) | |
| tree | 4f28f0c6189d7c49c2c6b804377198b17b00d190 /net/bluetooth | |
| parent | 0830c0a4891f9de009dfaa585dfecefa4c67795b (diff) | |
| download | linux-a2a8b0b4adeaec3de5213b7825588352a696df75.tar.gz linux-a2a8b0b4adeaec3de5213b7825588352a696df75.tar.bz2 linux-a2a8b0b4adeaec3de5213b7825588352a696df75.zip | |
Bluetooth: Fix crash when using new BT_PHY option
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>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/sco.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 9fb47b2b13c9..305710446e66 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -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; } diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 29ab3e12fb46..c8c3d38cdc7b 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -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; } |