summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-15 22:36:56 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-15 22:36:56 +0000
commit684873897636aee59fae0e68e6322959870a978c (patch)
tree6c413e94015f2ba6351ba4385e49022dba1b3730 /target
parenta2626c55188ba2866efc8e0b78c2273c4838b646 (diff)
[brcm-2.4] 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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21461 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/brcm-2.4/patches/200-fix_ipv6_receiving_with_ipv4_socket.patch18
1 files changed, 18 insertions, 0 deletions
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 0000000000..8d836c2ec5
--- /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;