net/ipv6/sit.c: return unhandled skb to tunnel4_rcv
Subsystems (2)
PATCH 1/1 net/ipv6/sit.c: return unhandled skb to tunnel4_rcv
Hi all,
I found a problem using an IPv6 over IPv4 tunnel. When CONFIG_IPV6_SIT was enabled, the packets would be rejected as net/ipv6/sit.c was catching all IPPROTO_IPV6 packets and returning an ICMP port unreachable error.
I think this patch fixes the problem cleanly. I believe the code in net/ipv4/tunnel4.c:tunnel4_rcv takes care of it properly if none of the handlers claim the skb.
Patch is against 2.6.35, bit still applies to current.
Cheers,
Davidm
net/ipv6/sit.c +2 -1
@@ -575,8 +575,9 @@return 0 ; } -icmp_send (skb,ICMP_DEST_UNREACH ,ICMP_PORT_UNREACH ,0 ); +/* no tunnel matched, let upstream know, ipsec may handle it */ rcu_read_unlock (); +return 1 ; out:kfree_skb (skb);return 0 ;
Signature · 2 lines
David McCullough, [email protected], Ph:+61 734352815 McAfee - SnapGear http://www.mcafee.com http://www.uCdot.org
Quoted 22 lines · David McCullough
Hi all,
I found a problem using an IPv6 over IPv4 tunnel. When
CONFIG_IPV6_SITwas enabled, the packets would be rejected asnet/ipv6/sit.cwas catching allIPPROTO_IPV6packets and returning an ICMP port unreachable error.I think this patch fixes the problem cleanly. I believe the code in net/ipv4/tunnel4.c:tunnel4_rcv takes care of it properly if none of the handlers claim the skb.
Patch is against 2.6.35, bit still applies to current.
Cheers,
DavidmSigned-off-by David McCullough <[email protected]>diff -u -r1.1.1.45
sit.c
net/ipv6/sit.c line 583
Quoted 10 lines
net/ipv6/sit.c +2
-1@@ -575,8 +575,9 @@return 0 ; } -icmp_send (skb,ICMP_DEST_UNREACH ,ICMP_PORT_UNREACH ,0 ); +/* no tunnel matched, let upstream know, ipsec may handle it */ rcu_read_unlock (); +return 1 ; out:kfree_skb (skb);return 0 ;
Good catch !
From: Eric Dumazet <[email protected]>
Date: Tue, 30 Nov 2010 07:12:44 +0100
Quoted 17 lines · David McCullough
Quoted 16 lines
Hi all,
I found a problem using an IPv6 over IPv4 tunnel. When
CONFIG_IPV6_SITwas enabled, the packets would be rejected asnet/ipv6/sit.cwas catching allIPPROTO_IPV6packets and returning an ICMP port unreachable error.I think this patch fixes the problem cleanly. I believe the code in net/ipv4/tunnel4.c:tunnel4_rcv takes care of it properly if none of the handlers claim the skb.
Patch is against 2.6.35, bit still applies to current.
Cheers,
DavidmSigned-off-by David McCullough <[email protected]>
...
Quoted 3 lines
Good catch !
Acked-by Eric Dumazet <[email protected]>
Applied, thanks.