3 files changed, 21 insertions, 6 deletions

diff --git a/kernel/cred.c b/kernel/cred.c
index 8ef31f53c44c..bb55d052d858 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -644,6 +644,9 @@ void __init cred_init(void)
  */
 struct cred *prepare_kernel_cred(struct task_struct *daemon)
 {
+#ifdef CONFIG_KEYS
+        struct thread_group_cred *tgcred;
+#endif
         const struct cred *old;
         struct cred *new;
 
@@ -651,6 +654,14 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon)
         if (!new)
                 return NULL;
 
+#ifdef CONFIG_KEYS
+        tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL);
+        if (!tgcred) {
+                kmem_cache_free(cred_jar, new);
+                return NULL;
+        }
+#endif
+
         kdebug("prepare_kernel_cred() alloc %p", new);
 
         if (daemon)
@@ -667,8 +678,11 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon)
         get_group_info(new->group_info);
 
 #ifdef CONFIG_KEYS
-        atomic_inc(&init_tgcred.usage);
-        new->tgcred = &init_tgcred;
+        atomic_set(&tgcred->usage, 1);
+        spin_lock_init(&tgcred->lock);
+        tgcred->process_keyring = NULL;
+        tgcred->session_keyring = NULL;
+        new->tgcred = tgcred;
         new->request_key_auth = NULL;
         new->thread_keyring = NULL;
         new->jit_keyring = KEY_REQKEY_DEFL_THREAD_KEYRING;
diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index c8008dd58ef2..640ded8f5c48 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -274,9 +274,7 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times)
         struct task_cputime sum;
         unsigned long flags;
 
-        spin_lock_irqsave(&cputimer->lock, flags);
         if (!cputimer->running) {
-                cputimer->running = 1;
                 /*
                  * The POSIX timer interface allows for absolute time expiry
                  * values through the TIMER_ABSTIME flag, therefore we have
@@ -284,8 +282,11 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times)
                  * it.
                  */
                 thread_group_cputime(tsk, &sum);
+                spin_lock_irqsave(&cputimer->lock, flags);
+                cputimer->running = 1;
                 update_gt_cputime(&cputimer->cputime, &sum);
-        }
+        } else
+                spin_lock_irqsave(&cputimer->lock, flags);
         *times = cputimer->cputime;
         spin_unlock_irqrestore(&cputimer->lock, flags);
 }
diff --git a/kernel/sys.c b/kernel/sys.c
index 18ee1d2f6474..1dbbe695a5ef 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1172,7 +1172,7 @@ DECLARE_RWSEM(uts_sem);
 static int override_release(char __user *release, int len)
 {
         int ret = 0;
-        char buf[len];
+        char buf[65];
 
         if (current->personality & UNAME26) {
                 char *rest = UTS_RELEASE;