---

yaml --- r: 187953 b: refs/heads/master c: 72150e9 h: refs/heads/master i: 187951: 6ac0450 v: v3
git-mirror · Mar 7, 2010 · d0f7717 · d0f7717
1 parent aa9f90a
commit d0f7717
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea3fb371b2a391958670f2a65e1203f7dba61671
+refs/heads/master: 72150e9b7fec217fbd646a29ea2f65a3d4d55ea9
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -2288,7 +2288,8 @@ int proto_register(struct proto *prot, int alloc_slab)
 		prot->rsk_prot->slab = NULL;
 	}
 out_free_request_sock_slab_name:
-	kfree(prot->rsk_prot->slab_name);
+	if (prot->rsk_prot)
+		kfree(prot->rsk_prot->slab_name);
 out_free_sock_slab:
 	kmem_cache_destroy(prot->slab);
 	prot->slab = NULL;