Message ID | 1492772132-16559-2-git-send-email-jhs@emojatatu.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
subj: s/user/use/ Fri, Apr 21, 2017 at 12:55:30PM CEST, jhs@mojatatu.com wrote: >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") ^^^^^^^^^^^^^^^^^ this is incorrect format. > >Thanks to Jiri Pirko for spotting it. Suggested-by: Jiri Pirko <jiri@mellanox.com> > >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 >
On 17-04-21 09:08 AM, Jiri Pirko wrote: > subj: s/user/use/ > > > Fri, Apr 21, 2017 at 12:55:30PM CEST, jhs@mojatatu.com wrote: >> 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") > > ^^^^^^^^^^^^^^^^^ this is incorrect format. > >> >> Thanks to Jiri Pirko for spotting it. > > Suggested-by: Jiri Pirko <jiri@mellanox.com> > > Will fix in the next update. cheers, jamal
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;