Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800a1c4c authored by Nguyen Dinh Phi's avatar Nguyen Dinh Phi Committed by Greg Kroah-Hartman
Browse files

Bluetooth: hci_sock: purge socket queues in the destruct() callback 



commit 709fca500067524381e28a5f481882930eebac88 upstream.

The receive path may take the socket right before hci_sock_release(),
but it may enqueue the packets to the socket queues after the call to
skb_queue_purge(), therefore the socket can be destroyed without clear
its queues completely.

Moving these skb_queue_purge() to the hci_sock_destruct() will fix this
issue, because nothing is referencing the socket at this point.

Signed-off-by: default avatarNguyen Dinh Phi <phind.uet@gmail.com>
Reported-by: default avatar <syzbot+4c4ffd1e1094dae61035@syzkaller.appspotmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarFedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27c64d90

net/bluetooth/hci_sock.c

+7 −4
Original line number Diff line number Diff line
@@ -881,10 +881,6 @@ static int hci_sock_release(struct socket *sock) 
	}



	sock_orphan(sk);



	skb_queue_purge(&sk->sk_receive_queue);

	skb_queue_purge(&sk->sk_write_queue);



	release_sock(sk);

	sock_put(sk);

	return 0;
@@ -1985,6 +1981,12 @@ static int hci_sock_getsockopt(struct socket *sock, int level, int optname, 
	return err;

}



static void hci_sock_destruct(struct sock *sk)

{

	skb_queue_purge(&sk->sk_receive_queue);

	skb_queue_purge(&sk->sk_write_queue);

}



static const struct proto_ops hci_sock_ops = {

	.family		= PF_BLUETOOTH,

	.owner		= THIS_MODULE,
@@ -2035,6 +2037,7 @@ static int hci_sock_create(struct net *net, struct socket *sock, int protocol, 


	sock->state = SS_UNCONNECTED;

	sk->sk_state = BT_OPEN;

	sk->sk_destruct = hci_sock_destruct;



	bt_sock_link(&hci_sk_list, sk);

	return 0;