diff options
Diffstat (limited to 'main/linux-grsec/net-ip_gre-fix-ipgre_header-to-return-correct-offset.patch')
| -rw-r--r-- | main/linux-grsec/net-ip_gre-fix-ipgre_header-to-return-correct-offset.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/main/linux-grsec/net-ip_gre-fix-ipgre_header-to-return-correct-offset.patch b/main/linux-grsec/net-ip_gre-fix-ipgre_header-to-return-correct-offset.patch deleted file mode 100644 index aeaeb33d7a..0000000000 --- a/main/linux-grsec/net-ip_gre-fix-ipgre_header-to-return-correct-offset.patch +++ /dev/null @@ -1,45 +0,0 @@ -From patchwork Tue Aug 6 10:45:43 2013 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [net] ip_gre: fix ipgre_header to return correct offset -From: =?utf-8?q?Timo_Ter=C3=A4s?= <timo.teras@iki.fi> -X-Patchwork-Id: 264994 -Message-Id: <1375785943-23908-1-git-send-email-timo.teras@iki.fi> -To: netdev@vger.kernel.org -Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>, - Pravin B Shelar <pshelar@nicira.com> -Date: Tue, 6 Aug 2013 13:45:43 +0300 - -Fix ipgre_header() (header_ops->create) to return the correct -amount of bytes pushed. Most callers of dev_hard_header() seem -to care only if it was success, but af_packet.c uses it as -offset to the skb to copy from userspace only once. In practice -this fixes packet socket sendto()/sendmsg() to gre tunnels. - -Regression introduced in c54419321455631079c7d6e60bc732dd0c5914c5 -("GRE: Refactor GRE tunneling code.") - -Cc: Pravin B Shelar <pshelar@nicira.com> -Signed-off-by: Timo Teräs <timo.teras@iki.fi> - ---- -Should go to 3.10-stable too. Without this dmvpn setup does not work -at all, as opennhrp uses packet sockets to send the nhrp packets. - - net/ipv4/ip_gre.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c -index 855004f..c52fee0 100644 ---- a/net/ipv4/ip_gre.c -+++ b/net/ipv4/ip_gre.c -@@ -572,7 +572,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev, - if (daddr) - memcpy(&iph->daddr, daddr, 4); - if (iph->daddr) -- return t->hlen; -+ return t->hlen + sizeof(*iph); - - return -(t->hlen + sizeof(*iph)); - } |