---

yaml --- r: 134297 b: refs/heads/master c: 9a279bc h: refs/heads/master i: 134295: acfef3f v: v3
git-mirror · Feb 5, 2009 · a28e936 · a28e936
1 parent af6b878
commit a28e936
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7870389478d3c682c79c07abe7f1fce8b8a81952
+refs/heads/master: 9a279bcbe347496799711155ed41a89bc40f79c5
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2288,6 +2288,8 @@ int netif_receive_skb(struct sk_buff *skb)
 	if (!skb)
 		goto out;
 
+	skb_orphan(skb);
+
 	type = skb->protocol;
 	list_for_each_entry_rcu(ptype,
 			&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {

diff --git a/trunk/net/netfilter/nf_tproxy_core.c b/trunk/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;