Merge commit 'v2.6.29-rc1' into tracing/urgent

1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/cred.c b/kernel/cred.c
index ff7bc071991c..3a039189d707 100644
--- 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)) {
-                set_dumpable(task->mm, suid_dumpable);
+                if (task->mm)
+                        set_dumpable(task->mm, suid_dumpable);
                 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);
 
+        *new = *old;
         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);
+        put_cred(old);
         return NULL;
 }
 EXPORT_SYMBOL(prepare_kernel_cred);