| Message ID | 1381427427-14880-1-git-send-email-ou.ghorbel@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Oct 10, 2013 at 06:50:27PM +0100, Oussama Ghorbel wrote: > The ip6_tnl.hlen (gre and ipv6 headers length) is independent from the > outgoing interface, so it would be better to initialize it even when no > route is found, otherwise its value will be zero. > While I'm not sure if this could happen in real life, but doing that > will avoid to call the skb_push function with a zero in ip6gre_header > function. > > Suggested-by: Hannes Frederic Sowa <hannes@stressinduktion.org> > Signed-off-by: Oussama Ghorbel <ou.ghorbel@gmail.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Thanks, Hannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Hannes Frederic Sowa <hannes@stressinduktion.org> Date: Fri, 11 Oct 2013 17:02:17 +0200 > On Thu, Oct 10, 2013 at 06:50:27PM +0100, Oussama Ghorbel wrote: >> The ip6_tnl.hlen (gre and ipv6 headers length) is independent from the >> outgoing interface, so it would be better to initialize it even when no >> route is found, otherwise its value will be zero. >> While I'm not sure if this could happen in real life, but doing that >> will avoid to call the skb_push function with a zero in ip6gre_header >> function. >> >> Suggested-by: Hannes Frederic Sowa <hannes@stressinduktion.org> >> Signed-off-by: Oussama Ghorbel <ou.ghorbel@gmail.com> > > Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" 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/ip6_gre.c b/net/ipv6/ip6_gre.c index 90747f1..8e4d42e 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -978,6 +978,7 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu) if (t->parms.o_flags&GRE_SEQ) addend += 4; } + t->hlen = addend; if (p->flags & IP6_TNL_F_CAP_XMIT) { int strict = (ipv6_addr_type(&p->raddr) & @@ -1004,8 +1005,6 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu) } ip6_rt_put(rt); } - - t->hlen = addend; } static int ip6gre_tnl_change(struct ip6_tnl *t,
The ip6_tnl.hlen (gre and ipv6 headers length) is independent from the outgoing interface, so it would be better to initialize it even when no route is found, otherwise its value will be zero. While I'm not sure if this could happen in real life, but doing that will avoid to call the skb_push function with a zero in ip6gre_header function. Suggested-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Oussama Ghorbel <ou.ghorbel@gmail.com> --- net/ipv6/ip6_gre.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)