From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 15 May 2010 22:36:56 +0000 (+0000)
Subject: fix a kernel bug where IPv6 packets are received on IPv4 sockets, this fixes dual... 
X-Git-Tag: reboot~19880
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f155da0922f3cf4b2170f92e1fd93052b322f927;p=openwrt%2Fstaging%2Fblogic.git

fix a kernel bug where IPv6 packets are received on IPv4 sockets, this fixes dual stack software like OLSRd when running on Kernel 2.4 Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>

SVN-Revision: 21461
---

diff --git a/target/linux/brcm-2.4/patches/200-fix_ipv6_receiving_with_ipv4_socket.patch b/target/linux/brcm-2.4/patches/200-fix_ipv6_receiving_with_ipv4_socket.patch
new file mode 100644
index 000000000000..8d836c2ec5ec
--- /dev/null
+++ b/target/linux/brcm-2.4/patches/200-fix_ipv6_receiving_with_ipv4_socket.patch
@@ -0,0 +1,18 @@
+--- a/net/ipv4/udp.c	2009-12-26 00:06:59.000000000 +0100
++++ b/net/ipv4/udp.c	2009-12-27 00:27:05.003012266 +0100
+@@ -711,7 +711,14 @@
+ 	skb = skb_recv_datagram(sk, flags, noblock, &err);
+ 	if (!skb)
+ 		goto out;
+-  
++
++	if (skb->nh.iph->version != 4) {
++		skb_free_datagram(sk, skb);
++		if (noblock)
++			return -EAGAIN;
++		goto try_again;
++	}
++
+   	copied = skb->len - sizeof(struct udphdr);
+ 	if (copied > len) {
+ 		copied = len;