diff options
| author | David McCullough <david_mccullough@mcafee.com> | 2010-11-29 19:32:34 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-01 13:19:34 -0800 |
| commit | 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7 (patch) | |
| tree | 4a0d21dbaf8d502c2b91777457065a9131b1eb9b /net | |
| parent | d13a2cb63d06fe2e3067c7d40f9a5946abd614c8 (diff) | |
| download | op-kernel-dev-6dcdd1b3694a4fa2b85167a9c860c7613a7553c7.zip op-kernel-dev-6dcdd1b3694a4fa2b85167a9c860c7613a7553c7.tar.gz | |
net/ipv6/sit.c: return unhandled skb to tunnel4_rcv
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.
Signed-off-by: David McCullough <david_mccullough@mcafee.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/sit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index d6bfaec..8c4d00c 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -606,8 +606,9 @@ static int ipip6_rcv(struct sk_buff *skb) 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; |
