CVE-2017-7979-0001-net_sched-nla_memdup_cookie-can-be-static.patch

   1 From e18cf144f49054fa79d43689accdd2766618953d Mon Sep 17 00:00:00 2001
   2 From: Wei Yongjun <weiyongjun1@huawei.com>
   3 Date: Mon, 24 Apr 2017 16:26:00 +0200
   4 Subject: [PATCH 1/2] net_sched: nla_memdup_cookie() can be static
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1682368
  10
  11 Fixes the following sparse warning:
  12
  13 net/sched/act_api.c:532:5: warning:
  14  symbol 'nla_memdup_cookie' was not declared. Should it be static?
  15
  16 Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 (cherry picked from commit 6f2e3f7d9785dacb358b48b44950182b5c13e4bc)
  19 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  20 Acked-by: Kamal Mostafa <kamal@canonical.com>
  21 Acked-by: Seth Forshee <seth.forshee@canonical.com>
  22 Signed-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
  27 diff --git a/net/sched/act_api.c b/net/sched/act_api.c
  28 index 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 --
  41 2.1.4
  42