]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop broken 4.4 llc networking patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Nov 2018 17:06:00 +0000 (18:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Nov 2018 17:06:00 +0000 (18:06 +0100)
queue-4.4/llc-set-sock_rcu_free-in-llc_sap_add_socket.patch [deleted file]
queue-4.4/series

diff --git a/queue-4.4/llc-set-sock_rcu_free-in-llc_sap_add_socket.patch b/queue-4.4/llc-set-sock_rcu_free-in-llc_sap_add_socket.patch
deleted file mode 100644 (file)
index 1648e3a..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From foo@baz Fri Nov  2 10:21:30 CET 2018
-From: Cong Wang <xiyou.wangcong@gmail.com>
-Date: Thu, 11 Oct 2018 11:15:13 -0700
-Subject: llc: set SOCK_RCU_FREE in llc_sap_add_socket()
-
-From: Cong Wang <xiyou.wangcong@gmail.com>
-
-[ Upstream commit 5a8e7aea953bdb6d4da13aff6f1e7f9c62023499 ]
-
-WHen an llc sock is added into the sk_laddr_hash of an llc_sap,
-it is not marked with SOCK_RCU_FREE.
-
-This causes that the sock could be freed while it is still being
-read by __llc_lookup_established() with RCU read lock. sock is
-refcounted, but with RCU read lock, nothing prevents the readers
-getting a zero refcnt.
-
-Fix it by setting SOCK_RCU_FREE in llc_sap_add_socket().
-
-Reported-by: syzbot+11e05f04c15e03be5254@syzkaller.appspotmail.com
-Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/llc/llc_conn.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/net/llc/llc_conn.c
-+++ b/net/llc/llc_conn.c
-@@ -734,6 +734,7 @@ void llc_sap_add_socket(struct llc_sap *
-       llc_sk(sk)->sap = sap;
-       spin_lock_bh(&sap->sk_lock);
-+      sock_set_flag(sk, SOCK_RCU_FREE);
-       sap->sk_count++;
-       sk_nulls_add_node_rcu(sk, laddr_hb);
-       hlist_add_head(&llc->dev_hash_node, dev_hb);
index b192851e092db3fa61cbba67ae707b665ecc12ca..662c65cb08e8f37b387304bfc352859275fc1706 100644 (file)
@@ -89,7 +89,6 @@ bridge-do-not-add-port-to-router-list-when-receives-query-with-source-0.0.0.0.pa
 net-bridge-remove-ipv6-zero-address-check-in-mcast-queries.patch
 ipv6-mcast-fix-a-use-after-free-in-inet6_mc_check.patch
 ipv6-ndisc-preserve-ipv6-control-buffer-if-protocol-error-handlers-are-called.patch
-llc-set-sock_rcu_free-in-llc_sap_add_socket.patch
 net-ipv6-fix-index-counter-for-unicast-addresses-in-in6_dump_addrs.patch
 net-sched-gred-pass-the-right-attribute-to-gred_change_table_def.patch
 net-socket-fix-a-missing-check-bug.patch