---

yaml --- r: 337 b: refs/heads/master c: 88a6685 h: refs/heads/master i: 335: 115ea91 v: v3
git-mirror · Apr 20, 2005 · 1b7a544 · 1b7a544
1 parent 9d7b182
commit 1b7a544
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c2b3328f74800bb370d08bb3a4255d5fe833e94
+refs/heads/master: 88a66858253c57334a519a77187234867bc8605c
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -641,7 +641,10 @@ struct sock *sk_alloc(int family, int priority, struct proto *prot, int zero_it)
 		}
 
 		if (security_sk_alloc(sk, family, priority)) {
-			kmem_cache_free(slab, sk);
+			if (slab != NULL)
+				kmem_cache_free(slab, sk);
+			else
+				kfree(sk);
 			sk = NULL;
 		} else
 			__module_get(prot->owner);