lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  CRED: Fix memory leak in error handling
This commit is contained in:
Linus Torvalds
2010-03-30 07:26:30 -07:00
parent 4660d3d240 570b8fb505
commit 246750ffa1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/cred.c
View File

@@ -364,7 +364,7 @@ struct cred *prepare_usermodehelper_creds(void)
new = kmem_cache_alloc(cred_jar, GFP_ATOMIC); new = kmem_cache_alloc(cred_jar, GFP_ATOMIC);
if (!new) if (!new)
return NULL; goto free_tgcred;
kdebug("prepare_usermodehelper_creds() alloc %p", new); kdebug("prepare_usermodehelper_creds() alloc %p", new);
@@ -397,6 +397,10 @@ struct cred *prepare_usermodehelper_creds(void)
error: error:
put_cred(new); put_cred(new);
free_tgcred:
#ifdef CONFIG_KEYS
kfree(tgcred);
#endif
return NULL; return NULL;
} }