summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-05-20 23:35:26 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-05-20 23:35:26 -0400
commitb5a7fa7fb4587ed1f252b1228250213549095364 (patch)
treeb068c83c22c634cc916243e1defecd16ec85f643
parentcc97268736539c3aec59f8404303c9ff3721cf61 (diff)
downloadlongterm-queue-4.8-b5a7fa7fb4587ed1f252b1228250213549095364.tar.gz
net: drop patch for 4.9+ driver
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/net-sched-act_skbmod-remove-unneeded-rcu_read_unlock.patch29
-rw-r--r--queue/series1
2 files changed, 0 insertions, 30 deletions
diff --git a/queue/net-sched-act_skbmod-remove-unneeded-rcu_read_unlock.patch b/queue/net-sched-act_skbmod-remove-unneeded-rcu_read_unlock.patch
deleted file mode 100644
index 811bad1..0000000
--- a/queue/net-sched-act_skbmod-remove-unneeded-rcu_read_unlock.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6c4dc75c251721f517e9daeb5370ea606b5b35ce Mon Sep 17 00:00:00 2001
-From: Alexey Khoroshilov <khoroshilov@ispras.ru>
-Date: Sun, 5 Mar 2017 03:01:55 +0300
-Subject: [PATCH] net/sched: act_skbmod: remove unneeded rcu_read_unlock in
- tcf_skbmod_dump
-
-commit 6c4dc75c251721f517e9daeb5370ea606b5b35ce upstream.
-
-Found by Linux Driver Verification project (linuxtesting.org).
-
-Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
-Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
-index 3b7074e23024..c736627f8f4a 100644
---- a/net/sched/act_skbmod.c
-+++ b/net/sched/act_skbmod.c
-@@ -228,7 +228,6 @@ static int tcf_skbmod_dump(struct sk_buff *skb, struct tc_action *a,
-
- return skb->len;
- nla_put_failure:
-- rcu_read_unlock();
- nlmsg_trim(skb, b);
- return -1;
- }
---
-2.12.0
-
diff --git a/queue/series b/queue/series
index 07a87f7..4828d83 100644
--- a/queue/series
+++ b/queue/series
@@ -102,7 +102,6 @@ dccp-Unlock-sock-before-calling-sk_free.patch
tcp-fix-various-issues-for-sockets-morphing-to-liste.patch
net-fix-socket-refcounting-in-skb_complete_wifi_ack.patch
net-fix-socket-refcounting-in-skb_complete_tx_timest.patch
-net-sched-act_skbmod-remove-unneeded-rcu_read_unlock.patch
dccp-fix-use-after-free-in-dccp_feat_activate_values.patch
vrf-Fix-use-after-free-in-vrf_xmit.patch
net-tunnel-set-inner-protocol-in-network-gro-hooks.patch