From patchwork Wed Apr 26 12:42:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamal Hadi Salim X-Patchwork-Id: 755461 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 3wCfr50hw1z9s8c for ; Wed, 26 Apr 2017 22:43:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="rTG6YtTd"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2999885AbdDZMm7 (ORCPT ); Wed, 26 Apr 2017 08:42:59 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:34553 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2999760AbdDZMmu (ORCPT ); Wed, 26 Apr 2017 08:42:50 -0400 Received: by mail-io0-f194.google.com with SMTP id h41so303599ioi.1 for ; Wed, 26 Apr 2017 05:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5GPHcWXjSXyg5BF1WCkh3WhJcnnEzzAGs/UkvitNc84=; b=rTG6YtTdSJKO7x292hF5zXIry7y70UfEFh+uLSo0mccbIi846mHAxXsawOzn5Nhsf5 7OaIxudA/8RI1tF9XPmxldZTjWswq5YiqRCfoD1ZxpYo9QirE3pWYPsEDIOOImCr3q/w f25glAC5o7vMVTGAxuEl7HG817ukK3LiGk4m2893XUNQht3NdHMZLXgTZaEcSatgyGJC X7YojC4rspTqCIbuPG7ZDEtccqhQAKR5Iku7REHzfA49SIgOblXHA8o0YxqQzlg5x825 6445mGWn2ec8iON2JjqFElWXBlAw7/YQynREXa40bkfReKu4ROrDJguaf+G8Xf2IkH1i sv7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5GPHcWXjSXyg5BF1WCkh3WhJcnnEzzAGs/UkvitNc84=; b=dN8SKq833PZn/nuJm/KDjgXfeRI7gTKSuwhopXAJQY6XMfvRsJ1NfPBP8Dt4Rzg/wV wOrHYtkuVJZ3EXbULt6eoF0uDafXUlmYM74tWtfmViQfvCj5vy8OVpv3/tG6Gp+AY6o7 nBFDZKQkwVUAcBfHW30yU6MGvWjQ8MnLBKaQfNhZ8Sepqes5xivZKco2dk8irpG+sLhp ZWB3clIGvu0ioxGw5TwFjIk+mkOYlbWAw63mlWl3AlNxOEp1TNP0FGnYUJZigJ8u3vSr D6JvoItrYjYlsiRkMkqpPLvhWg/UG7fizxBGGaSdzvRVqenWJcJPl8Ff8sN2ss08UAeM 5iaA== X-Gm-Message-State: AN3rC/7Zt2cEXlJXxgymok7yDnd2ZntluA3WtKbcQZj439f0TXI1Tp/c CPEXljox6wxCvg== X-Received: by 10.107.203.1 with SMTP id b1mr6135369iog.29.1493210569575; Wed, 26 Apr 2017 05:42:49 -0700 (PDT) Received: from jhs-UX303LB.lan (23-233-25-245.cpe.pppoe.ca. [23.233.25.245]) by smtp.gmail.com with ESMTPSA id a10sm3553785itj.1.2017.04.26.05.42.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Apr 2017 05:42:48 -0700 (PDT) From: Jamal Hadi Salim X-Google-Original-From: Jamal Hadi Salim To: davem@davemloft.net Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com, eric.dumazet@gmail.com, simon.horman@netronome.com, netdev@vger.kernel.org, Jamal Hadi Salim Subject: [PATCH net-next v9 1/3] net sched actions: Use proper root attribute table for actions Date: Wed, 26 Apr 2017 08:42:16 -0400 Message-Id: <1493210538-21716-2-git-send-email-jhs@emojatatu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1493210538-21716-1-git-send-email-jhs@emojatatu.com> References: <1493210538-21716-1-git-send-email-jhs@emojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim Bug fix for an issue which has been around for about a decade. We got away with it because the enumeration was larger than needed. Fixes: 7ba699c604ab ("[NET_SCHED]: Convert actions from rtnetlink to new netlink API") Suggested-by: Jiri Pirko Reviewed-by: Simon Horman Signed-off-by: Jamal Hadi Salim --- net/sched/act_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 7f2cd70..9d0f007 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -1031,7 +1031,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, struct netlink_ext_ack *extack) { struct net *net = sock_net(skb->sk); - struct nlattr *tca[TCA_ACT_MAX + 1]; + struct nlattr *tca[TCAA_MAX + 1]; u32 portid = skb ? NETLINK_CB(skb).portid : 0; int ret = 0, ovr = 0; @@ -1039,7 +1039,7 @@ static int tc_ctl_action(struct sk_buff *skb, struct nlmsghdr *n, !netlink_capable(skb, CAP_NET_ADMIN)) return -EPERM; - ret = nlmsg_parse(n, sizeof(struct tcamsg), tca, TCA_ACT_MAX, NULL, + ret = nlmsg_parse(n, sizeof(struct tcamsg), tca, TCAA_MAX, NULL, extack); if (ret < 0) return ret;