| Message ID | 1462874192-8360-1-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, May 10, 2016 at 2:56 AM, Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > From: Tom Herbert <tom@herbertland.com> > > The handler 'ila_fill_encap_info' adds two attributes: ILA_ATTR_LOCATOR > and ILA_ATTR_CSUM_MODE. > > nla_total_size_64bit() must be use for ILA_ATTR_LOCATOR. > > Also, do nla_put_u8 instead of nla_put_u64 for ILA_ATTR_CSUM_MODE. > > Fixes: f13a82d87b21 ("ipv6: use nla_put_u64_64bit()") > Fixes: 90bfe662db13 ("ila: add checksum neutral ILA translations") > Reported-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Signed-off-by: Tom Herbert <tom@herbertland.com> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > > Tom, I have taken the liberty of resending your patch, I hope it's ok > for you. Goal is to fix this before net-next closes. > > v1 -> v2: > update the patch after the merge of net (and thus update 'Fixes' tag) > use nla_total_size_64bit() for ILA_ATTR_LOCATOR > > net/ipv6/ila/ila_lwt.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c > index 17038e1ede98..1dfb64166d7d 100644 > --- a/net/ipv6/ila/ila_lwt.c > +++ b/net/ipv6/ila/ila_lwt.c > @@ -133,7 +133,7 @@ static int ila_fill_encap_info(struct sk_buff *skb, > if (nla_put_u64_64bit(skb, ILA_ATTR_LOCATOR, (__force u64)p->locator.v64, > ILA_ATTR_PAD)) > goto nla_put_failure; > - if (nla_put_u64(skb, ILA_ATTR_CSUM_MODE, (__force u8)p->csum_mode)) > + if (nla_put_u8(skb, ILA_ATTR_CSUM_MODE, (__force u8)p->csum_mode)) > goto nla_put_failure; > > return 0; > @@ -144,7 +144,9 @@ nla_put_failure: > > static int ila_encap_nlsize(struct lwtunnel_state *lwtstate) > { > - return nla_total_size(sizeof(u64)); /* ILA_ATTR_LOCATOR */ > + return nla_total_size_64bit(sizeof(u64)) + /* ILA_ATTR_LOCATOR */ > + nla_total_size(sizeof(u8)) + /* ILA_ATTR_CSUM_MODE */ > + 0; > } > > static int ila_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b) > -- > 2.8.1 > Acked-by: Tom Herbert <tom@herbertland.com>
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Tue, 10 May 2016 11:56:32 +0200 > From: Tom Herbert <tom@herbertland.com> > > The handler 'ila_fill_encap_info' adds two attributes: ILA_ATTR_LOCATOR > and ILA_ATTR_CSUM_MODE. > > nla_total_size_64bit() must be use for ILA_ATTR_LOCATOR. > > Also, do nla_put_u8 instead of nla_put_u64 for ILA_ATTR_CSUM_MODE. > > Fixes: f13a82d87b21 ("ipv6: use nla_put_u64_64bit()") > Fixes: 90bfe662db13 ("ila: add checksum neutral ILA translations") > Reported-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Signed-off-by: Tom Herbert <tom@herbertland.com> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Applied.
diff --git a/net/ipv6/ila/ila_lwt.c b/net/ipv6/ila/ila_lwt.c index 17038e1ede98..1dfb64166d7d 100644 --- a/net/ipv6/ila/ila_lwt.c +++ b/net/ipv6/ila/ila_lwt.c @@ -133,7 +133,7 @@ static int ila_fill_encap_info(struct sk_buff *skb, if (nla_put_u64_64bit(skb, ILA_ATTR_LOCATOR, (__force u64)p->locator.v64, ILA_ATTR_PAD)) goto nla_put_failure; - if (nla_put_u64(skb, ILA_ATTR_CSUM_MODE, (__force u8)p->csum_mode)) + if (nla_put_u8(skb, ILA_ATTR_CSUM_MODE, (__force u8)p->csum_mode)) goto nla_put_failure; return 0; @@ -144,7 +144,9 @@ nla_put_failure: static int ila_encap_nlsize(struct lwtunnel_state *lwtstate) { - return nla_total_size(sizeof(u64)); /* ILA_ATTR_LOCATOR */ + return nla_total_size_64bit(sizeof(u64)) + /* ILA_ATTR_LOCATOR */ + nla_total_size(sizeof(u8)) + /* ILA_ATTR_CSUM_MODE */ + 0; } static int ila_encap_cmp(struct lwtunnel_state *a, struct lwtunnel_state *b)