git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugzilla-12270' into release
[safe/jmp/linux-2.6]
/
net
/
netfilter
/
nf_tproxy_core.c
diff --git
a/net/netfilter/nf_tproxy_core.c
b/net/netfilter/nf_tproxy_core.c
index
cdc97f3
..
5490fc3
100644
(file)
--- a/
net/netfilter/nf_tproxy_core.c
+++ b/
net/netfilter/nf_tproxy_core.c
@@
-71,6
+71,7
@@
int
nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk)
{
if (inet_sk(sk)->transparent) {
+ skb_orphan(skb);
skb->sk = sk;
skb->destructor = nf_tproxy_destructor;
return 1;