diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2010-03-29 19:04:00 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-30 02:15:38 -0400 |
| commit | 570b8fb505896e007fd3bb07573ba6640e51851d (patch) | |
| tree | fd36f685aa2028628605733708bbf7d1af62f3ec | |
| parent | 9623e5a23724d09283c238960946ec6f65733afe (diff) | |
CRED: Fix memory leak in error handling
Fix a memory leak on an OOM condition in prepare_usermodehelper_creds().
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | kernel/cred.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 1ed8ca18790c..1b1129d0cce8 100644 --- a/kernel/cred.c +++ b/kernel/cred.c | |||
| @@ -364,7 +364,7 @@ struct cred *prepare_usermodehelper_creds(void) | |||
| 364 | 364 | ||
| 365 | new = kmem_cache_alloc(cred_jar, GFP_ATOMIC); | 365 | new = kmem_cache_alloc(cred_jar, GFP_ATOMIC); |
| 366 | if (!new) | 366 | if (!new) |
| 367 | return NULL; | 367 | goto free_tgcred; |
| 368 | 368 | ||
| 369 | kdebug("prepare_usermodehelper_creds() alloc %p", new); | 369 | kdebug("prepare_usermodehelper_creds() alloc %p", new); |
| 370 | 370 | ||
| @@ -397,6 +397,10 @@ struct cred *prepare_usermodehelper_creds(void) | |||
| 397 | 397 | ||
| 398 | error: | 398 | error: |
| 399 | put_cred(new); | 399 | put_cred(new); |
| 400 | free_tgcred: | ||
| 401 | #ifdef CONFIG_KEYS | ||
| 402 | kfree(tgcred); | ||
| 403 | #endif | ||
| 400 | return NULL; | 404 | return NULL; |
| 401 | } | 405 | } |
| 402 | 406 | ||
