aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_input.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-08-09 19:45:02 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 15:37:22 -0700
commitd13964f4490157b8a290903362bfbc54f750a6bc (patch)
tree377297846b513224a30185fb279afd6640e361f5 /net/ipv6/ip6_input.c
parent0bd1b59b15e4057101c89d4db15a3683c0d897f7 (diff)
downloadkernel_samsung_smdk4412-d13964f4490157b8a290903362bfbc54f750a6bc.zip
kernel_samsung_smdk4412-d13964f4490157b8a290903362bfbc54f750a6bc.tar.gz
kernel_samsung_smdk4412-d13964f4490157b8a290903362bfbc54f750a6bc.tar.bz2
[IPV4/6]: Check if packet was actually delivered to a raw socket to decide whether to send an ICMP unreachable
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_input.c')
-rw-r--r--net/ipv6/ip6_input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index ab51c03..6e34804 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -166,8 +166,8 @@ resubmit:
nexthdr = skb->nh.raw[nhoff];
raw_sk = sk_head(&raw_v6_htable[nexthdr & (MAX_INET_PROTOS - 1)]);
- if (raw_sk)
- ipv6_raw_deliver(skb, nexthdr);
+ if (raw_sk && !ipv6_raw_deliver(skb, nexthdr))
+ raw_sk = NULL;
hash = nexthdr & (MAX_INET_PROTOS - 1);
if ((ipprot = rcu_dereference(inet6_protos[hash])) != NULL) {