linux-stable.git/net/ipv4/fou.c, branch linux-4.1.y

gro: Allow tunnel stacking in the case of FOU/GUE

2017-01-13T17:21:59+00:00

[ Upstream commit c3483384ee511ee2af40b4076366cd82a6a47b86 ]

This patch should fix the issues seen with a recent fix to prevent
tunnel-in-tunnel frames from being generated with GRO.  The fix itself is
correct for now as long as we do not add any devices that support
NETIF_F_GSO_GRE_CSUM.  When such a device is added it could have the
potential to mess things up due to the fact that the outer transport header
points to the outer UDP header and not the GRE header as would be expected.

Fixes: fac8e0f579695 ("tunnels: Don't apply GRO to multiple layers of encapsulation.")
Signed-off-by: Alexander Duyck 
Signed-off-by: David S. Miller 
Signed-off-by: Sasha Levin

net: add recursion limit to GRO

2016-12-23T13:56:36+00:00

[ Debian: net-add-recursion-limit-to-gro.patch ]

Currently, GRO can do unlimited recursion through the gro_receive
handlers.  This was fixed for tunneling protocols by limiting tunnel GRO
to one level with encap_mark, but both VLAN and TEB still have this
problem.  Thus, the kernel is vulnerable to a stack overflow, if we
receive a packet composed entirely of VLAN headers.

This patch adds a recursion counter to the GRO layer to prevent stack
overflow.  When a gro_receive function hits the recursion limit, GRO is
aborted for this skb and it is processed normally.

Thanks to Vladimír Beneš  for the initial bug report.

Fixes: CVE-2016-7039
Fixes: 9b174d88c257 ("net: Add Transparent Ethernet Bridging GRO support.")
Fixes: 66e5133f19e9 ("vlan: Add GRO support for non hardware accelerated vlan")
Signed-off-by: Sabrina Dubroca 
Reviewed-by: Jiri Benc 
Acked-by: Hannes Frederic Sowa 
Signed-off-by: Philipp Hahn 
Signed-off-by: Sasha Levin

fou: clean up socket with kfree_rcu

2016-01-23T04:54:16+00:00

[ Upstream commit 3036facbb7be3a169e35be3b271162b0fa564a2d ]

fou->udp_offloads is managed by RCU. As it is actually included inside
the fou sockets, we cannot let the memory go out of scope before a grace
period. We either can synchronize_rcu or switch over to kfree_rcu to
manage the sockets. kfree_rcu seems appropriate as it is used by vxlan
and geneve.

Fixes: 23461551c00628c ("fou: Support for foo-over-udp RX path")
Cc: Tom Herbert 
Signed-off-by: Hannes Frederic Sowa 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

fou: avoid missing unlock in failure path

2015-04-16T16:11:19+00:00

Fixes: 7a6c8c34e5b7 ("fou: implement FOU_CMD_GET")
Reported-by: Dan Carpenter 
Cc: Dan Carpenter 
Signed-off-by: Cong Wang 
Signed-off-by: David S. Miller

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

2015-04-14T19:44:14+00:00

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: David S. Miller

fou: implement FOU_CMD_GET

2015-04-13T01:25:13+00:00

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

fou: add network namespace support

2015-04-13T01:25:13+00:00

Also convert the spinlock to a mutex.

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

fou: always use be16 for port

2015-04-13T01:25:13+00:00

udp_config.local_udp_port is be16. And iproute2 passes
network order for FOU_ATTR_PORT.

This doesn't fix any bug, just for consistency.

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

fou: exit early when parsing config fails

2015-04-13T01:25:13+00:00

Not a big deal, just for corretness.

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

fou: avoid calling udp_del_offload() twice

2015-04-13T01:25:13+00:00

This fixes the following harmless warning:

./ip/ip fou del port 7777
[  122.907516] udp_del_offload: didn't find offload for port 7777

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