Commit 6dcdd1b3 authored by David McCullough's avatar David McCullough Committed by David S. Miller

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: default avatarDavid McCullough <david_mccullough@mcafee.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d13a2cb6
...@@ -606,8 +606,9 @@ static int ipip6_rcv(struct sk_buff *skb) ...@@ -606,8 +606,9 @@ static int ipip6_rcv(struct sk_buff *skb)
return 0; 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(); rcu_read_unlock();
return 1;
out: out:
kfree_skb(skb); kfree_skb(skb);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment