Bluetooth: Fix crash when using new BT_PHY option (a2a8b0b4) · Commits · 戴 / test

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>

net/bluetooth/l2cap_sock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message