linux.git/net/ipv6/ip6_gre.c, branch v3.12

ipv6: Initialize ip6_tnl.hlen in gre tunnel even if no route is found

2013-10-11T21:50:59+00:00

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 
Signed-off-by: Oussama Ghorbel 
Acked-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

ipv6: Fix the upper MTU limit in GRE tunnel

2013-10-08T20:32:40+00:00

Unlike ipv4, the struct member hlen holds the length of the GRE and ipv6
headers. This length is also counted in dev->hard_header_len.
Perhaps, it's more clean to modify the hlen to count only the GRE header
without ipv6 header as the variable name suggest, but the simple way to fix
this without regression risk is simply modify the calculation of the limit
in ip6gre_tunnel_change_mtu function.
Verified in kernel version v3.11.

Signed-off-by: Oussama Ghorbel 
Acked-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller

ipv6: gre: correct calculation of max_headroom

2013-10-01T05:04:09+00:00

gre_hlen already accounts for sizeof(struct ipv6_hdr) + gre header,
so initialize max_headroom to zero. Otherwise the

	if (encap_limit >= 0) {
		max_headroom += 8;
		mtu -= 8;
	}

increments an uninitialized variable before max_headroom was reset.

Found with coverity: 728539

Cc: Dmitry Kozlov 
Signed-off-by: Hannes Frederic Sowa 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-09-05T18:58:52+00:00

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
	net/bridge/br_multicast.c
	net/ipv6/sit.c

The conflicts were minor:

1) sit.c changes overlap with change to ip_tunnel_xmit() signature.

2) br_multicast.c had an overlap between computing max_delay using
   msecs_to_jiffies and turning MLDV2_MRC() into an inline function
   with a name using lowercase instead of uppercase letters.

3) stmmac had two overlapping changes, one which conditionally allocated
   and hooked up a dma_cfg based upon the presence of the pbl OF property,
   and another one handling store-and-forward DMA made.  The latter of
   which should not go into the new of_find_property() basic block.

Signed-off-by: David S. Miller

tunnels: harmonize cleanup done on skb on rx path

2013-09-04T04:27:26+00:00

The goal of this patch is to harmonize cleanup done on a skbuff on rx path.
Before this patch, behaviors were different depending of the tunnel type.

Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller

tunnels: harmonize cleanup done on skb on xmit path

2013-09-04T04:27:25+00:00

The goal of this patch is to harmonize cleanup done on a skbuff on xmit path.
Before this patch, behaviors were different depending of the tunnel type.

Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller

ipv6: wire up skb->encapsulation

2013-08-19T07:37:46+00:00

When pushing a new header before current one call skb_reset_inner_headers
to record the position of the inner headers in the various ipv6 tunnel
protocols.

We later need this to correctly identify the addresses needed to send
back an error in the xfrm layer.

This change is safe, because skb->protocol is always checked before
dereferencing data from the inner protocol.

Cc: Steffen Klassert 
Cc: YOSHIFUJI Hideaki 
Cc: Nicolas Dichtel 
Acked-by: Eric Dumazet 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: Steffen Klassert

ip6tnl: add x-netns support

2013-08-15T08:00:20+00:00

This patch allows to switch the netns when packet is encapsulated or
decapsulated. In other word, the encapsulated packet is received in a netns,
where the lookup is done to find the tunnel. Once the tunnel is found, the
packet is decapsulated and injecting into the corresponding interface which
stands to another netns.

When one of the two netns is removed, the tunnel is destroyed.

Signed-off-by: Nicolas Dichtel 
Signed-off-by: David S. Miller

ipv6,gre: do not leak info to user-space

2013-05-12T00:40:14+00:00

There is a hole in struct ip6_tnl_parm2, so we have to
zero the struct on stack before copying it to user-space.

Cc: David S. Miller 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

Tunneling: use IP Tunnel stats APIs.

2013-03-26T16:27:19+00:00

Use common function get calculate rtnl_link_stats64 stats.

Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller