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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
kernel
/
cred.c
diff --git
a/kernel/cred.c
b/kernel/cred.c
index
ff7bc07
..
3a03918
100644
(file)
--- a/
kernel/cred.c
+++ b/
kernel/cred.c
@@
-372,7
+372,8
@@
int commit_creds(struct cred *new)
old->fsuid != new->fsuid ||
old->fsgid != new->fsgid ||
!cap_issubset(new->cap_permitted, old->cap_permitted)) {
old->fsuid != new->fsuid ||
old->fsgid != new->fsgid ||
!cap_issubset(new->cap_permitted, old->cap_permitted)) {
- set_dumpable(task->mm, suid_dumpable);
+ if (task->mm)
+ set_dumpable(task->mm, suid_dumpable);
task->pdeath_signal = 0;
smp_wmb();
}
task->pdeath_signal = 0;
smp_wmb();
}
@@
-506,6
+507,7
@@
struct cred *prepare_kernel_cred(struct task_struct *daemon)
else
old = get_cred(&init_cred);
else
old = get_cred(&init_cred);
+ *new = *old;
get_uid(new->user);
get_group_info(new->group_info);
get_uid(new->user);
get_group_info(new->group_info);
@@
-529,6
+531,7
@@
struct cred *prepare_kernel_cred(struct task_struct *daemon)
error:
put_cred(new);
error:
put_cred(new);
+ put_cred(old);
return NULL;
}
EXPORT_SYMBOL(prepare_kernel_cred);
return NULL;
}
EXPORT_SYMBOL(prepare_kernel_cred);