summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-16 11:02:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-15 15:28:48 -0800
commit85e963b89ad0727eca17bf0ac65a1cbf110b1bb6 (patch)
treeab6954624a8027abe7709c8b10a2cbf69d5e49d0 /net
parent57bc52eb25cff3ddd096598bf40e9be7673eb83a (diff)
downloadlinux-3.10-85e963b89ad0727eca17bf0ac65a1cbf110b1bb6.tar.gz
linux-3.10-85e963b89ad0727eca17bf0ac65a1cbf110b1bb6.tar.bz2
linux-3.10-85e963b89ad0727eca17bf0ac65a1cbf110b1bb6.zip
ip_gre: fix msg_name parsing for recvfrom/recvmsg
[ Upstream commit 0e3da5bb8da45890b1dc413404e0f978ab71173e ] ipgre_header_parse() needs to parse the tunnel's ip header and it uses mac_header to locate the iphdr. This got broken when gre tunneling was refactored as mac_header is no longer updated to point to iphdr. Introduce skb_pop_mac_header() helper to do the mac_header assignment and use it in ipgre_rcv() to fix msg_name parsing. Bug introduced in commit c54419321455 (GRE: Refactor GRE tunneling code.) Cc: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: Timo Teräs <timo.teras@iki.fi> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_gre.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 64e4e98c878..828b2e8631e 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -335,6 +335,7 @@ static int ipgre_rcv(struct sk_buff *skb)
iph->saddr, iph->daddr, tpi.key);
if (tunnel) {
+ skb_pop_mac_header(skb);
ip_tunnel_rcv(tunnel, skb, &tpi, hdr_len, log_ecn_error);
return 0;
}