git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
kernel
/
cred.c
diff --git
a/kernel/cred.c
b/kernel/cred.c
index
1ed8ca1
..
e1dbe9e
100644
(file)
--- a/
kernel/cred.c
+++ b/
kernel/cred.c
@@
-10,6
+10,7
@@
*/
#include <linux/module.h>
#include <linux/cred.h>
*/
#include <linux/module.h>
#include <linux/cred.h>
+#include <linux/slab.h>
#include <linux/sched.h>
#include <linux/key.h>
#include <linux/keyctl.h>
#include <linux/sched.h>
#include <linux/key.h>
#include <linux/keyctl.h>
@@
-364,7
+365,7
@@
struct cred *prepare_usermodehelper_creds(void)
new = kmem_cache_alloc(cred_jar, GFP_ATOMIC);
if (!new)
new = kmem_cache_alloc(cred_jar, GFP_ATOMIC);
if (!new)
-
return NULL
;
+
goto free_tgcred
;
kdebug("prepare_usermodehelper_creds() alloc %p", new);
kdebug("prepare_usermodehelper_creds() alloc %p", new);
@@
-397,6
+398,10
@@
struct cred *prepare_usermodehelper_creds(void)
error:
put_cred(new);
error:
put_cred(new);
+free_tgcred:
+#ifdef CONFIG_KEYS
+ kfree(tgcred);
+#endif
return NULL;
}
return NULL;
}