From patchwork Tue Jan 3 15:47:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yotam Gigi X-Patchwork-Id: 710516 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ttJFM5JwKz9t0v for ; Wed, 4 Jan 2017 02:45:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757328AbdACPpw (ORCPT ); Tue, 3 Jan 2017 10:45:52 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:40802 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752763AbdACPpl (ORCPT ); Tue, 3 Jan 2017 10:45:41 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yotamg@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 Jan 2017 17:44:48 +0200 Received: from dev-r-vrt-156.mtr.labs.mlnx (dev-r-vrt-156.mtr.labs.mlnx [10.212.156.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v03FimP2018494; Tue, 3 Jan 2017 17:44:48 +0200 From: Yotam Gigi To: jhs@mojatatu.com, davem@davemloft.net, eladr@mellanox.com, jiri@mellanox.com, netdev@vger.kernel.org Cc: Yotam Gigi Subject: [PATCH net-next] net/sched: cls_matchall: Fix error path Date: Tue, 3 Jan 2017 17:47:02 +0200 Message-Id: <1483458422-13607-1-git-send-email-yotamg@mellanox.com> X-Mailer: git-send-email 2.4.11 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix several error paths in matchall: - Release reference to actions in case the hardware fails offloading (relevant to skip_sw only) - Fix error path in case tcf_exts initialization fails Fixes: bf3994d2ed31 ("net/sched: introduce Match-all classifier") Signed-off-by: Yotam Gigi --- net/sched/cls_matchall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c index f935429..ce7d28b 100644 --- a/net/sched/cls_matchall.c +++ b/net/sched/cls_matchall.c @@ -144,7 +144,7 @@ static int mall_set_parms(struct net *net, struct tcf_proto *tp, tcf_exts_init(&e, TCA_MATCHALL_ACT, 0); err = tcf_exts_validate(net, tp, tb, est, &e, ovr); if (err < 0) - return err; + goto errout; if (tb[TCA_MATCHALL_CLASSID]) { f->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]); @@ -154,6 +154,9 @@ static int mall_set_parms(struct net *net, struct tcf_proto *tp, tcf_exts_change(tp, &f->exts, &e); return 0; +errout: + tcf_exts_destroy(&e); + return err; } static int mall_change(struct net *net, struct sk_buff *in_skb, @@ -220,6 +223,7 @@ static int mall_change(struct net *net, struct sk_buff *in_skb, return 0; errout: + tcf_exts_destroy(&f->exts); kfree(f); return err; }