net/sched: cls_flower: reduce fl_change stack size

The new ARP support has pushed the stack size over the edge on ARM,
as there are two large objects on the stack in this function (mask
and tb) and both have now grown a bit more:

net/sched/cls_flower.c: In function 'fl_change':
net/sched/cls_flower.c:928:1: error: the frame size of 1072 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]

We can solve this by dynamically allocating one or both of them.
I first tried to do it just for the mask, but that only saved
152 bytes on ARM, while this version just does it for the 'tb'
array, bringing the stack size back down to 664 bytes.

Fixes: 99d31326cbe6 ("net/sched: cls_flower: Support matching on ARP")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 27934456d9840ee16d8e5f93e88a6ab82a5d823b..9e74b0fa4b896a8a8eb25929760ab51c57c546f1 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -832,23 +832,31 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
        struct cls_fl_head *head = rtnl_dereference(tp->root);
        struct cls_fl_filter *fold = (struct cls_fl_filter *) *arg;
        struct cls_fl_filter *fnew;
-       struct nlattr *tb[TCA_FLOWER_MAX + 1];
+       struct nlattr **tb;
        struct fl_flow_mask mask = {};
        int err;
 
        if (!tca[TCA_OPTIONS])
                return -EINVAL;
 
+       tb = kcalloc(TCA_FLOWER_MAX + 1, sizeof(struct nlattr *), GFP_KERNEL);
+       if (!tb)
+               return -ENOBUFS;
+
        err = nla_parse_nested(tb, TCA_FLOWER_MAX, tca[TCA_OPTIONS], fl_policy);
        if (err < 0)
-               return err;
+               goto errout_tb;
 
-       if (fold && handle && fold->handle != handle)
-               return -EINVAL;
+       if (fold && handle && fold->handle != handle) {
+               err = -EINVAL;
+               goto errout_tb;
+       }
 
        fnew = kzalloc(sizeof(*fnew), GFP_KERNEL);
-       if (!fnew)
-               return -ENOBUFS;
+       if (!fnew) {
+               err = -ENOBUFS;
+               goto errout_tb;
+       }
 
        err = tcf_exts_init(&fnew->exts, TCA_FLOWER_ACT, 0);
        if (err < 0)
@@ -919,11 +927,14 @@ static int fl_change(struct net *net, struct sk_buff *in_skb,
                list_add_tail_rcu(&fnew->list, &head->filters);
        }
 
+       kfree(tb);
        return 0;
 
 errout:
        tcf_exts_destroy(&fnew->exts);
        kfree(fnew);
+errout_tb:
+       kfree(tb);
        return err;
 }