| Message ID | 1461140382-4784-7-git-send-email-aar@pengutronix.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hello. On 20/04/16 10:19, Alexander Aring wrote: > This patch makes the address length as argument for the > ndisc_fill_addr_option function. This is necessary to handle addresses > which don't use dev->addr_len as address length. > > Cc: David S. Miller<davem@davemloft.net> > Cc: Alexey Kuznetsov<kuznet@ms2.inr.ac.ru> > Cc: James Morris<jmorris@namei.org> > Cc: Hideaki YOSHIFUJI<yoshfuji@linux-ipv6.org> > Cc: Patrick McHardy<kaber@trash.net> > Signed-off-by: Alexander Aring<aar@pengutronix.de> > --- > net/ipv6/ndisc.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c > index 4e91d5e..176c7c4 100644 > --- a/net/ipv6/ndisc.c > +++ b/net/ipv6/ndisc.c > @@ -150,11 +150,11 @@ struct neigh_table nd_tbl = { > }; > EXPORT_SYMBOL_GPL(nd_tbl); > > -static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data) > +static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data, > + int data_len) > { > int pad = ndisc_addr_option_pad(skb->dev->type); > - int data_len = skb->dev->addr_len; > - int space = ndisc_opt_addr_space(skb->dev, skb->dev->addr_len); > + int space = ndisc_opt_addr_space(skb->dev, data_len); > u8 *opt = skb_put(skb, space); > > opt[0] = type; > @@ -528,7 +528,7 @@ void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr, > > if (inc_opt) > ndisc_fill_addr_option(skb, ND_OPT_TARGET_LL_ADDR, > - dev->dev_addr); > + dev->dev_addr, dev->addr_len); > > > ndisc_send_skb(skb, daddr, src_addr); > @@ -590,7 +590,7 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit, > > if (inc_opt) > ndisc_fill_addr_option(skb, ND_OPT_SOURCE_LL_ADDR, > - dev->dev_addr); > + dev->dev_addr, dev->addr_len); > > ndisc_send_skb(skb, daddr, saddr); > } > @@ -641,7 +641,7 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr, > > if (send_sllao) > ndisc_fill_addr_option(skb, ND_OPT_SOURCE_LL_ADDR, > - dev->dev_addr); > + dev->dev_addr, dev->addr_len); > > ndisc_send_skb(skb, daddr, saddr); > } > @@ -1597,7 +1597,8 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) > */ > > if (ha) > - ndisc_fill_addr_option(buff, ND_OPT_TARGET_LL_ADDR, ha); > + ndisc_fill_addr_option(buff, ND_OPT_TARGET_LL_ADDR, ha, > + dev->addr_len); > > /* > * build redirect option and copy skb over to the new packet. Reviewed-by: Stefan Schmidt<stefan@osg.samsung.com> regards Stefan Schmidt -- To unsubscribe from this list: send the line "unsubscribe linux-wpan" 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/ipv6/ndisc.c b/net/ipv6/ndisc.c index 4e91d5e..176c7c4 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -150,11 +150,11 @@ struct neigh_table nd_tbl = { }; EXPORT_SYMBOL_GPL(nd_tbl); -static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data) +static void ndisc_fill_addr_option(struct sk_buff *skb, int type, void *data, + int data_len) { int pad = ndisc_addr_option_pad(skb->dev->type); - int data_len = skb->dev->addr_len; - int space = ndisc_opt_addr_space(skb->dev, skb->dev->addr_len); + int space = ndisc_opt_addr_space(skb->dev, data_len); u8 *opt = skb_put(skb, space); opt[0] = type; @@ -528,7 +528,7 @@ void ndisc_send_na(struct net_device *dev, const struct in6_addr *daddr, if (inc_opt) ndisc_fill_addr_option(skb, ND_OPT_TARGET_LL_ADDR, - dev->dev_addr); + dev->dev_addr, dev->addr_len); ndisc_send_skb(skb, daddr, src_addr); @@ -590,7 +590,7 @@ void ndisc_send_ns(struct net_device *dev, const struct in6_addr *solicit, if (inc_opt) ndisc_fill_addr_option(skb, ND_OPT_SOURCE_LL_ADDR, - dev->dev_addr); + dev->dev_addr, dev->addr_len); ndisc_send_skb(skb, daddr, saddr); } @@ -641,7 +641,7 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr, if (send_sllao) ndisc_fill_addr_option(skb, ND_OPT_SOURCE_LL_ADDR, - dev->dev_addr); + dev->dev_addr, dev->addr_len); ndisc_send_skb(skb, daddr, saddr); } @@ -1597,7 +1597,8 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) */ if (ha) - ndisc_fill_addr_option(buff, ND_OPT_TARGET_LL_ADDR, ha); + ndisc_fill_addr_option(buff, ND_OPT_TARGET_LL_ADDR, ha, + dev->addr_len); /* * build redirect option and copy skb over to the new packet.
This patch makes the address length as argument for the ndisc_fill_addr_option function. This is necessary to handle addresses which don't use dev->addr_len as address length. Cc: David S. Miller <davem@davemloft.net> Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Cc: James Morris <jmorris@namei.org> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Cc: Patrick McHardy <kaber@trash.net> Signed-off-by: Alexander Aring <aar@pengutronix.de> --- net/ipv6/ndisc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)