diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-06-27 04:22:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-27 04:22:37 +0200 |
| commit | 71f9dacd2e4d233029e9e956ca3f79531f411827 (patch) | |
| tree | f625e54e95107dcbc622a6ecf64138fca3d8e0c7 /net/ipv6 | |
| parent | mac80211: Use rcu_barrier() on unload. (diff) | |
| download | linux-71f9dacd2e4d233029e9e956ca3f79531f411827.tar.xz linux-71f9dacd2e4d233029e9e956ca3f79531f411827.zip | |
inet: Call skb_orphan before tproxy activates
As transparent proxying looks up the socket early and assigns
it to the skb for later processing, we must drop any existing
socket ownership prior to that in order to distinguish between
the case where tproxy is active and where it is not.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index c3a07d75b5f5..6d6a4277c677 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -139,6 +139,9 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt rcu_read_unlock(); + /* Must drop socket now because of tproxy. */ + skb_orphan(skb); + return NF_HOOK(PF_INET6, NF_INET_PRE_ROUTING, skb, dev, NULL, ip6_rcv_finish); err: |