]> git.proxmox.com Git - pve-kernel.git/blame - CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch
update kernel source to Ubuntu-4.10.0-21.23
[pve-kernel.git] / CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch
CommitLineData
7f0f6370
FG
1From e18cf144f49054fa79d43689accdd2766618953d Mon Sep 17 00:00:00 2001
2From: Wei Yongjun <weiyongjun1@huawei.com>
3Date: Mon, 24 Apr 2017 16:26:00 +0200
4Subject: [PATCH 1/2] net_sched: nla_memdup_cookie() can be static
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1682368
10
11Fixes the following sparse warning:
12
13net/sched/act_api.c:532:5: warning:
14 symbol 'nla_memdup_cookie' was not declared. Should it be static?
15
16Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
17Signed-off-by: David S. Miller <davem@davemloft.net>
18(cherry picked from commit 6f2e3f7d9785dacb358b48b44950182b5c13e4bc)
19Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
20Acked-by: Kamal Mostafa <kamal@canonical.com>
21Acked-by: Seth Forshee <seth.forshee@canonical.com>
22Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
23---
24 net/sched/act_api.c | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/net/sched/act_api.c b/net/sched/act_api.c
28index 501c42d..e336f30 100644
29--- a/net/sched/act_api.c
30+++ b/net/sched/act_api.c
31@@ -532,7 +532,7 @@ int tcf_action_dump(struct sk_buff *skb, struct list_head *actions,
32 return err;
33 }
34
35-int nla_memdup_cookie(struct tc_action *a, struct nlattr **tb)
36+static int nla_memdup_cookie(struct tc_action *a, struct nlattr **tb)
37 {
38 a->act_cookie = kzalloc(sizeof(*a->act_cookie), GFP_KERNEL);
39 if (!a->act_cookie)
40--
412.1.4
42