From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800AbdASJqd (ORCPT ); Thu, 19 Jan 2017 04:46:33 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:57040 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751599AbdASJqa (ORCPT ); Thu, 19 Jan 2017 04:46:30 -0500 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Jamal Hadi Salim , Jiri Pirko , Hadar Hen Zion , Amir Vadai , Paul Blakey , Or Gerlitz , Simon Horman , Roi Dayan , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net/sched: cls_flower: reduce fl_change stack size Date: Thu, 19 Jan 2017 10:45:31 +0100 Message-Id: <20170119094551.2780983-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:b9T2lrwJ+iOMw1aUv9rXHRWXiUooJS6VUtmV749KoXj2UN90BH1 7UdnUOWxN4fCn5BKneidWUyIrlD+B4TjTc5SRZVarFaOkxeYtNVP8OoZZlnw2I6mF4THMAi Simzjz5T4W8e8l/7Q+QNDMuTPp6lJuz9PdsLnn88OmATjebotEr4UAQe24sjVfb+HmE1eVD vi0LG7OfpzA4/E6tw/45Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:ZfqZz0Bu+UI=:o4BdSsguOp/lmeFrumaMyk A94TBgHt6CvnbrI3TozT7wpi9QVUaj3CfwcJeYXY8hqFai/UtahQUr0YYdTrac2BTXsIxFGmD b323xY/hBwNZO+COzA3qWu+1CExpIC0vDW9kLIit8gGki80KeN+tPI48xXGHGC8utk5X8F1/R 11XX2bdr1yerPh84apxj+vvmY2quNcocTAM27zYhC/lnBpesgZqIEttjpYCmKQL9p+Mxp3PML ESpunI8JbuNbVI1WmHBgiK/A9nf7nGOXCSr8kPbHHxbCZ+wE/6aKoQHmIb3FBlH8kB47INiM7 Zw9tC6wvLK1yn3Hpv0A6xm5EZMERZI/c5wUaSiEOOFWwRgxYbeWK33E4Kx61rwi8K5UeGW/QI qR8veHTck4XcifujCIxcVdC5KfbmpziS88+2Y4qZJFT1lNqRYjwUZjQikJpTYtCH9sfSaIAkj FaySN8ltWTvb9Nv7fEzPE9KelQdUuZvCETLszbO85aws6E19b6XQaIcNHgB6aF69+roNOzHzp AcSDHcyhosNgOY2654bGmOtkIEQAS/y+HivRzV/t81wruZx/48o/9SpauJKSJhHg43pro4eBY QvcujKU5BRHCSYU0yn8jhdiTyJW/ya9HmfEbEPEmFDg73RCQRqOPzlcFZ6xnFNH9izTVaZELv 5JURtqgDOx9MmgeBg0CzWMQv+cOAYH4HdIE+nNGUaaMDuZl9FphnQN0hpk3i6QTdKJxY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- net/sched/cls_flower.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 27934456d984..9e74b0fa4b89 100644 --- 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; } -- 2.9.0