]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop network patch from 4.9
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 May 2018 19:30:05 +0000 (21:30 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 May 2018 19:30:05 +0000 (21:30 +0200)
queue-4.9/net-sched-fix-refcnt-leak-in-the-error-path-of-tcf_vlan_init.patch [deleted file]
queue-4.9/series

diff --git a/queue-4.9/net-sched-fix-refcnt-leak-in-the-error-path-of-tcf_vlan_init.patch b/queue-4.9/net-sched-fix-refcnt-leak-in-the-error-path-of-tcf_vlan_init.patch
deleted file mode 100644 (file)
index 9b1a41d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From foo@baz Tue May 22 21:05:16 CEST 2018
-From: Davide Caratti <dcaratti@redhat.com>
-Date: Wed, 16 May 2018 12:54:29 +0200
-Subject: net/sched: fix refcnt leak in the error path of tcf_vlan_init()
-
-From: Davide Caratti <dcaratti@redhat.com>
-
-[ Upstream commit 5a4931ae0193f8a4a97e8260fd0df1d705d83299 ]
-
-Similarly to what was done with commit a52956dfc503 ("net sched actions:
-fix refcnt leak in skbmod"), fix the error path of tcf_vlan_init() to avoid
-refcnt leaks when wrong value of TCA_VLAN_PUSH_VLAN_PROTOCOL is given.
-
-Fixes: 5026c9b1bafc ("net sched: vlan action fix late binding")
-CC: Roman Mashak <mrv@mojatatu.com>
-Signed-off-by: Davide Caratti <dcaratti@redhat.com>
-Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/sched/act_vlan.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/net/sched/act_vlan.c
-+++ b/net/sched/act_vlan.c
-@@ -156,6 +156,8 @@ static int tcf_vlan_init(struct net *net
-                       case htons(ETH_P_8021AD):
-                               break;
-                       default:
-+                              if (exists)
-+                                      tcf_idr_release(*a, bind);
-                               return -EPROTONOSUPPORT;
-                       }
-               } else {
index f60ea768d2de80360cfc3563891d3778d4b1b0fa..e310589bc085ee8fe1d6d2161c230c31c9532e54 100644 (file)
@@ -1,5 +1,4 @@
 net-mlx4_core-fix-error-handling-in-mlx4_init_port_info.patch
-net-sched-fix-refcnt-leak-in-the-error-path-of-tcf_vlan_init.patch
 net-test-tailroom-before-appending-to-linear-skb.patch
 packet-in-packet_snd-start-writing-at-link-layer-allocation.patch
 sock_diag-fix-use-after-free-read-in-__sk_free.patch