Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
kernel/cred.c: use kmem_cache_free

+1 -1
+1 -1
kernel/cred.c
··· 224 #ifdef CONFIG_KEYS 225 new->tgcred = kzalloc(sizeof(*new->tgcred), GFP_KERNEL); 226 if (!new->tgcred) { 227 - kfree(new); 228 return NULL; 229 } 230 atomic_set(&new->tgcred->usage, 1);
··· 224 #ifdef CONFIG_KEYS 225 new->tgcred = kzalloc(sizeof(*new->tgcred), GFP_KERNEL); 226 if (!new->tgcred) { 227 + kmem_cache_free(cred_jar, new); 228 return NULL; 229 } 230 atomic_set(&new->tgcred->usage, 1);