From a48ee0744b543398416d2953e9faf1ef1de2d2fd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 22 May 2018 21:30:05 +0200 Subject: [PATCH] drop network patch from 4.9 --- ...k-in-the-error-path-of-tcf_vlan_init.patch | 34 ------------------- queue-4.9/series | 1 - 2 files changed, 35 deletions(-) delete mode 100644 queue-4.9/net-sched-fix-refcnt-leak-in-the-error-path-of-tcf_vlan_init.patch 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 index 9b1a41de271..00000000000 --- a/queue-4.9/net-sched-fix-refcnt-leak-in-the-error-path-of-tcf_vlan_init.patch +++ /dev/null @@ -1,34 +0,0 @@ -From foo@baz Tue May 22 21:05:16 CEST 2018 -From: Davide Caratti -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 - -[ 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 -Signed-off-by: Davide Caratti -Acked-by: Jamal Hadi Salim -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - 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 { diff --git a/queue-4.9/series b/queue-4.9/series index f60ea768d2d..e310589bc08 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -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 -- 2.47.2