diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-03 03:12:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-03 03:12:22 +0100 |
| commit | c80d292f137275a1ed88e6ed515ecb457051f1a4 (patch) | |
| tree | 4bfbab3536ac8e7ca11c08fdd933cffbae803cba /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | kernel/cred.c: use kmem_cache_free (diff) | |
| download | linux-c80d292f137275a1ed88e6ed515ecb457051f1a4.tar.xz linux-c80d292f137275a1ed88e6ed515ecb457051f1a4.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index dd76cfe5f5b0..1ed8ca18790c 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); |