drop patches applied upstream

[pve-kernel.git] / CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch

diff --git a/CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch b/CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch
deleted file mode 100644 (file)
index 6400aae..0000000
--- a/CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e18cf144f49054fa79d43689accdd2766618953d Mon Sep 17 00:00:00 2001
-From: Wei Yongjun <weiyongjun1@huawei.com>
-Date: Mon, 24 Apr 2017 16:26:00 +0200
-Subject: [PATCH 1/2] net_sched: nla_memdup_cookie() can be static
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1682368
-
-Fixes the following sparse warning:
-
-net/sched/act_api.c:532:5: warning:
- symbol 'nla_memdup_cookie' was not declared. Should it be static?
-
-Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 6f2e3f7d9785dacb358b48b44950182b5c13e4bc)
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
-Acked-by: Kamal Mostafa <kamal@canonical.com>
-Acked-by: Seth Forshee <seth.forshee@canonical.com>
-Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
----
- net/sched/act_api.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/sched/act_api.c b/net/sched/act_api.c
-index 501c42d..e336f30 100644
---- a/net/sched/act_api.c
-+++ b/net/sched/act_api.c
-@@ -532,7 +532,7 @@ int tcf_action_dump(struct sk_buff *skb, struct list_head *actions,
-       return err;
- }
- 
--int nla_memdup_cookie(struct tc_action *a, struct nlattr **tb)
-+static int nla_memdup_cookie(struct tc_action *a, struct nlattr **tb)
- {
-       a->act_cookie = kzalloc(sizeof(*a->act_cookie), GFP_KERNEL);
-       if (!a->act_cookie)
--- 
-2.1.4
-