Commit c80d292f authored Feb 02, 2010 by Linus Torvalds

Merge branch 'for-linus' of...

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

parents 2a2a5660 b8a1d37c

kernel/cred.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ struct cred *cred_alloc_blank(void)
		#ifdef CONFIG_KEYS
		new->tgcred = kzalloc(sizeof(*new->tgcred), GFP_KERNEL);
		if (!new->tgcred) {
		kfree(new);
		kmem_cache_free(cred_jar, new);
		return NULL;
		}
		atomic_set(&new->tgcred->usage, 1);