5.10-stable patches

added patches:
	bluetooth-hci_sock-purge-socket-queues-in-the-destruct-callback.patch

diff --git a/queue-5.10/bluetooth-hci_sock-purge-socket-queues-in-the-destruct-callback.patch b/queue-5.10/bluetooth-hci_sock-purge-socket-queues-in-the-destruct-callback.patch
new file mode 100644 (file)
index 0000000..b3dc5a2
--- /dev/null
+++ b/queue-5.10/bluetooth-hci_sock-purge-socket-queues-in-the-destruct-callback.patch
@@ -0,0 +1,60 @@
+From 709fca500067524381e28a5f481882930eebac88 Mon Sep 17 00:00:00 2001
+From: Nguyen Dinh Phi <phind.uet@gmail.com>
+Date: Fri, 8 Oct 2021 03:04:24 +0800
+Subject: Bluetooth: hci_sock: purge socket queues in the destruct() callback
+
+From: Nguyen Dinh Phi <phind.uet@gmail.com>
+
+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: Nguyen Dinh Phi <phind.uet@gmail.com>
+Reported-by: syzbot+4c4ffd1e1094dae61035@syzkaller.appspotmail.com
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/bluetooth/hci_sock.c |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/net/bluetooth/hci_sock.c
++++ b/net/bluetooth/hci_sock.c
+@@ -888,10 +888,6 @@ static int hci_sock_release(struct socke
+       }
+ 
+       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;
+@@ -2012,6 +2008,12 @@ done:
+       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,
+@@ -2065,6 +2067,7 @@ static int hci_sock_create(struct net *n
+ 
+       sock->state = SS_UNCONNECTED;
+       sk->sk_state = BT_OPEN;
++      sk->sk_destruct = hci_sock_destruct;
+ 
+       bt_sock_link(&hci_sk_list, sk);
+       return 0;

diff --git a/queue-5.10/series b/queue-5.10/series
index 67c184f3884e57dd592e0905ac64da4f2a47cfe0..152f647ea45b7260da02949d00454810699ad5c7 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -515,3 +515,4 @@ x86-resctrl-apply-read_once-write_once-to-task_struct.-rmid-closid.patch
 x86-resctl-fix-scheduler-confusion-with-current.patch
 drm-display-dp_mst-fix-down-up-message-handling-after-sink-disconnect.patch
 drm-display-dp_mst-fix-down-message-handling-after-a-packet-reception-error.patch
+bluetooth-hci_sock-purge-socket-queues-in-the-destruct-callback.patch