aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2005-08-09 22:45:02 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 18:37:22 -0400
commitd13964f4490157b8a290903362bfbc54f750a6bc (patch)
tree377297846b513224a30185fb279afd6640e361f5 /net/ipv6
parent0bd1b59b15e4057101c89d4db15a3683c0d897f7 (diff)
[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')
-rw-r--r--net/ipv6/ip6_input.c4
-rw-r--r--net/ipv6/raw.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index ab51c0369e15..6e3480426939 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -166,8 +166,8 @@ resubmit:
166 nexthdr = skb->nh.raw[nhoff]; 166 nexthdr = skb->nh.raw[nhoff];
167 167
168 raw_sk = sk_head(&raw_v6_htable[nexthdr & (MAX_INET_PROTOS - 1)]); 168 raw_sk = sk_head(&raw_v6_htable[nexthdr & (MAX_INET_PROTOS - 1)]);
169 if (raw_sk) 169 if (raw_sk && !ipv6_raw_deliver(skb, nexthdr))
170 ipv6_raw_deliver(skb, nexthdr); 170 raw_sk = NULL;
171 171
172 hash = nexthdr & (MAX_INET_PROTOS - 1); 172 hash = nexthdr & (MAX_INET_PROTOS - 1);
173 if ((ipprot = rcu_dereference(inet6_protos[hash])) != NULL) { 173 if ((ipprot = rcu_dereference(inet6_protos[hash])) != NULL) {
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 9db0de81f074..a082646e6f16 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -141,11 +141,12 @@ static __inline__ int icmpv6_filter(struct sock *sk, struct sk_buff *skb)
141 * 141 *
142 * Caller owns SKB so we must make clones. 142 * Caller owns SKB so we must make clones.
143 */ 143 */
144void ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) 144int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
145{ 145{
146 struct in6_addr *saddr; 146 struct in6_addr *saddr;
147 struct in6_addr *daddr; 147 struct in6_addr *daddr;
148 struct sock *sk; 148 struct sock *sk;
149 int delivered = 0;
149 __u8 hash; 150 __u8 hash;
150 151
151 saddr = &skb->nh.ipv6h->saddr; 152 saddr = &skb->nh.ipv6h->saddr;
@@ -167,6 +168,7 @@ void ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
167 sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr, skb->dev->ifindex); 168 sk = __raw_v6_lookup(sk, nexthdr, daddr, saddr, skb->dev->ifindex);
168 169
169 while (sk) { 170 while (sk) {
171 delivered = 1;
170 if (nexthdr != IPPROTO_ICMPV6 || !icmpv6_filter(sk, skb)) { 172 if (nexthdr != IPPROTO_ICMPV6 || !icmpv6_filter(sk, skb)) {
171 struct sk_buff *clone = skb_clone(skb, GFP_ATOMIC); 173 struct sk_buff *clone = skb_clone(skb, GFP_ATOMIC);
172 174
@@ -179,6 +181,7 @@ void ipv6_raw_deliver(struct sk_buff *skb, int nexthdr)
179 } 181 }
180out: 182out:
181 read_unlock(&raw_v6_lock); 183 read_unlock(&raw_v6_lock);
184 return delivered;
182} 185}
183 186
184/* This cleans up af_inet6 a bit. -DaveM */ 187/* This cleans up af_inet6 a bit. -DaveM */