summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-02 18:12:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-02 18:12:22 -0800
commitc80d292f137275a1ed88e6ed515ecb457051f1a4 (patch)
tree4bfbab3536ac8e7ca11c08fdd933cffbae803cba /kernel
parent2a2a5660f10a468016fed594ab09d77ef0bb6079 (diff)
parentb8a1d37c5f981cdd2e83c9fd98198832324cd57a (diff)
downloadop-kernel-dev-c80d292f137275a1ed88e6ed515ecb457051f1a4.zip
op-kernel-dev-c80d292f137275a1ed88e6ed515ecb457051f1a4.tar.gz
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cred.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cred.c b/kernel/cred.c
index dd76cfe..1ed8ca1 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -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);
OpenPOWER on IntegriCloud