| Message ID | 1478218443-11616-1-git-send-email-xiyou.wangcong@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
On Thu, Nov 03, 2016 at 05:14:03PM -0700, Cong Wang wrote: > family.maxattr is the max index for policy[], the size of > ops[] is determined with ARRAY_SIZE(). > > Reported-by: Andrey Konovalov <andreyknvl@google.com> > Tested-by: Andrey Konovalov <andreyknvl@google.com> > Cc: Pablo Neira Ayuso <pablo@netfilter.org> > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: Simon Horman <horms@verge.net.au> Pablo, can you take this one into nf? > --- > net/netfilter/ipvs/ip_vs_ctl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c > index c3c809b..a6e44ef 100644 > --- a/net/netfilter/ipvs/ip_vs_ctl.c > +++ b/net/netfilter/ipvs/ip_vs_ctl.c > @@ -2845,7 +2845,7 @@ static struct genl_family ip_vs_genl_family = { > .hdrsize = 0, > .name = IPVS_GENL_NAME, > .version = IPVS_GENL_VERSION, > - .maxattr = IPVS_CMD_MAX, > + .maxattr = IPVS_CMD_ATTR_MAX, > .netnsok = true, /* Make ipvsadm to work on netns */ > }; > > -- > 2.1.0 > -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 04, 2016 at 11:58:44AM +0100, Simon Horman wrote: > On Thu, Nov 03, 2016 at 05:14:03PM -0700, Cong Wang wrote: > > family.maxattr is the max index for policy[], the size of > > ops[] is determined with ARRAY_SIZE(). > > > > Reported-by: Andrey Konovalov <andreyknvl@google.com> > > Tested-by: Andrey Konovalov <andreyknvl@google.com> > > Cc: Pablo Neira Ayuso <pablo@netfilter.org> > > Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> > > > Signed-off-by: Simon Horman <horms@verge.net.au> > > Pablo, can you take this one into nf? Applied, thanks! -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index c3c809b..a6e44ef 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -2845,7 +2845,7 @@ static struct genl_family ip_vs_genl_family = { .hdrsize = 0, .name = IPVS_GENL_NAME, .version = IPVS_GENL_VERSION, - .maxattr = IPVS_CMD_MAX, + .maxattr = IPVS_CMD_ATTR_MAX, .netnsok = true, /* Make ipvsadm to work on netns */ };