From: Jamal Hadi Salim <jhs@mojatatu.com>
To: davem@davemloft.net
Cc: jiri@resnulli.us, xiyou.wangcong@gmail.com,
eric.dumazet@gmail.com, netdev@vger.kernel.org,
Jamal Hadi Salim <jhs@mojatatu.com>
Subject: [PATCH net-next v6 1/3] net sched actions: User proper root attribute table for actions
Date: Fri, 21 Apr 2017 06:55:30 -0400 [thread overview]
Message-ID: <1492772132-16559-2-git-send-email-jhs@emojatatu.com> (raw)
In-Reply-To: <1492772132-16559-1-git-send-email-jhs@emojatatu.com>
From: Jamal Hadi Salim <jhs@mojatatu.com>
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 commit 7ba699c604ab ("[NET_SCHED]: Convert actions from rtnetlink to new netlink API")
Thanks to Jiri Pirko for spotting it.
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
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 82b1d48..9ce22b7 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -997,7 +997,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;
@@ -1005,7 +1005,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;
--
1.9.1
next prev parent reply other threads:[~2017-04-21 10:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 10:55 [PATCH net-next v6 0/3] net sched actions: improve dump performance Jamal Hadi Salim
2017-04-21 10:55 ` Jamal Hadi Salim [this message]
2017-04-21 13:08 ` [PATCH net-next v6 1/3] net sched actions: User proper root attribute table for actions Jiri Pirko
2017-04-21 14:50 ` Jamal Hadi Salim
2017-04-21 10:55 ` [PATCH net-next v6 2/3] net sched actions: dump more than TCA_ACT_MAX_PRIO actions per batch Jamal Hadi Salim
2017-04-21 13:12 ` Jiri Pirko
2017-04-21 15:12 ` Jamal Hadi Salim
2017-04-21 15:20 ` Eric Dumazet
2017-04-21 15:40 ` Jamal Hadi Salim
2017-04-21 16:07 ` David Miller
2017-04-21 16:10 ` Eric Dumazet
2017-04-21 10:55 ` [PATCH net-next v6 3/3] net sched actions: add time filter for action dumping Jamal Hadi Salim
2017-04-21 13:13 ` Jiri Pirko
2017-04-21 15:13 ` Jamal Hadi Salim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1492772132-16559-2-git-send-email-jhs@emojatatu.com \
--to=jhs@mojatatu.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox