Commit 7b19ffc4 authored Oct 20, 2006 by Marcel Holtmann Committed by David S. Miller Oct 20, 2006

[Bluetooth] Fix HID disconnect NULL pointer dereference

The latest HID disconnect sequence change introduced a NULL pointer
dereference. For the quirk to handle buggy remote HID implementations,
it is enough to wait for a potential control channel disconnect from
the remote side and it is also enough to wait only 500 msecs.

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

parent 8602b4fe

net/bluetooth/hidp/core.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -507,12 +507,10 @@ static int hidp_session(void *arg)

		hidp_del_timer(session);

		if (intr_sk->sk_state != BT_CONNECTED)
		wait_event_timeout(*(ctrl_sk->sk_sleep), (ctrl_sk->sk_state == BT_CLOSED), HZ);

		fput(session->intr_sock->file);

		wait_event_timeout(*(intr_sk->sk_sleep), (intr_sk->sk_state == BT_CLOSED), HZ);
		wait_event_timeout(*(ctrl_sk->sk_sleep),
		(ctrl_sk->sk_state == BT_CLOSED), msecs_to_jiffies(500));

		fput(session->ctrl_sock->file);