1 files changed, 7 insertions, 9 deletions

diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index d1db2880d1c..a09a54936f1 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -291,30 +291,28 @@ static int add_del_listener(pid_t pid, const struct cpumask *mask, int isadd)
         if (!cpumask_subset(mask, cpu_possible_mask))
                 return -EINVAL;
 
-        s = NULL;
         if (isadd == REGISTER) {
                 for_each_cpu(cpu, mask) {
-                        if (!s)
-                                s = kmalloc_node(sizeof(struct listener),
-                                                 GFP_KERNEL, cpu_to_node(cpu));
+                        s = kmalloc_node(sizeof(struct listener),
+                                        GFP_KERNEL, cpu_to_node(cpu));
                         if (!s)
                                 goto cleanup;
+
                         s->pid = pid;
-                        INIT_LIST_HEAD(&s->list);
                         s->valid = 1;
 
                         listeners = &per_cpu(listener_array, cpu);
                         down_write(&listeners->sem);
-                        list_for_each_entry_safe(s2, tmp, &listeners->list, list) {
+                        list_for_each_entry(s2, &listeners->list, list) {
                                 if (s2->pid == pid)
-                                        goto next_cpu;
+                                        goto exists;
                         }
                         list_add(&s->list, &listeners->list);
                         s = NULL;
-next_cpu:
+exists:
                         up_write(&listeners->sem);
+                        kfree(s); /* nop if NULL */
                 }
-                kfree(s);
                 return 0;
         }