6 files changed, 7 insertions, 14 deletions

diff --git a/ipc/sem.c b/ipc/sem.c
index 21b3289d640c..d3e12efd55cb 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1070,14 +1070,13 @@ static struct sem_undo *find_undo(struct ipc_namespace *ns, int semid)
         ipc_rcu_getref(sma);
         sem_unlock(sma);
 
-        new = (struct sem_undo *) kmalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL);
+        new = kzalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL);
         if (!new) {
                 ipc_lock_by_ptr(&sma->sem_perm);
                 ipc_rcu_putref(sma);
                 sem_unlock(sma);
                 return ERR_PTR(-ENOMEM);
         }
-        memset(new, 0, sizeof(struct sem_undo) + sizeof(short)*nsems);
         new->semadj = (short *) &new[1];
         new->semid = semid;
 
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
index 4f40d923af8e..2e896f8ae29e 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
@@ -636,10 +636,9 @@ static struct audit_rule *audit_krule_to_rule(struct audit_krule *krule)
         struct audit_rule *rule;
         int i;
 
-        rule = kmalloc(sizeof(*rule), GFP_KERNEL);
+        rule = kzalloc(sizeof(*rule), GFP_KERNEL);
         if (unlikely(!rule))
                 return NULL;
-        memset(rule, 0, sizeof(*rule));
 
         rule->flags = krule->flags | krule->listnr;
         rule->action = krule->action;
diff --git a/kernel/futex.c b/kernel/futex.c
index af7b81cbde30..7c0d0d4fa7f7 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -324,12 +324,11 @@ static int refill_pi_state_cache(void)
         if (likely(current->pi_state_cache))
                 return 0;
 
-        pi_state = kmalloc(sizeof(*pi_state), GFP_KERNEL);
+        pi_state = kzalloc(sizeof(*pi_state), GFP_KERNEL);
 
         if (!pi_state)
                 return -ENOMEM;
 
-        memset(pi_state, 0, sizeof(*pi_state));
         INIT_LIST_HEAD(&pi_state->list);
         /* pi_mutex gets initialized later */
         pi_state->owner = NULL;
diff --git a/kernel/kexec.c b/kernel/kexec.c
index fcdd5d2bc3f4..d43692cf2321 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -108,11 +108,10 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
 
         /* Allocate a controlling structure */
         result = -ENOMEM;
-        image = kmalloc(sizeof(*image), GFP_KERNEL);
+        image = kzalloc(sizeof(*image), GFP_KERNEL);
         if (!image)
                 goto out;
 
-        memset(image, 0, sizeof(*image));
         image->head = 0;
         image->entry = &image->head;
         image->last_entry = &image->head;
diff --git a/lib/kobject.c b/lib/kobject.c
index 744a4b102c7f..7ce6dc138e90 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -111,10 +111,9 @@ char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
         len = get_kobj_path_length(kobj);
         if (len == 0)
                 return NULL;
-        path = kmalloc(len, gfp_mask);
+        path = kzalloc(len, gfp_mask);
         if (!path)
                 return NULL;
-        memset(path, 0x00, len);
         fill_kobj_path(kobj, path, len);
 
         return path;
diff --git a/mm/nommu.c b/mm/nommu.c
index 6a2a8aada401..af874569d0f1 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -808,10 +808,9 @@ unsigned long do_mmap_pgoff(struct file *file,
         vm_flags = determine_vm_flags(file, prot, flags, capabilities);
 
         /* we're going to need to record the mapping if it works */
-        vml = kmalloc(sizeof(struct vm_list_struct), GFP_KERNEL);
+        vml = kzalloc(sizeof(struct vm_list_struct), GFP_KERNEL);
         if (!vml)
                 goto error_getting_vml;
-        memset(vml, 0, sizeof(*vml));
 
         down_write(&nommu_vma_sem);
 
@@ -887,11 +886,10 @@ unsigned long do_mmap_pgoff(struct file *file,
         }
 
         /* we're going to need a VMA struct as well */
-        vma = kmalloc(sizeof(struct vm_area_struct), GFP_KERNEL);
+        vma = kzalloc(sizeof(struct vm_area_struct), GFP_KERNEL);
         if (!vma)
                 goto error_getting_vma;
 
-        memset(vma, 0, sizeof(*vma));
         INIT_LIST_HEAD(&vma->anon_vma_node);
         atomic_set(&vma->vm_usage, 1);
         if (file)