mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path
If either of the vas or vms arrays are not properly kzalloced, then the code jumps to the err_free label. The err_free label runs a loop to check and free each of the array members of the vas and vms arrays which is not required for this situation as none of the array members have been allocated till this point. Eliminate the extra loop we have to go through by introducing a new label err_free2 and then jumping to it. [akpm@linux-foundation.org: remove now-unneeded tests] Signed-off-by: Kautuk Consul <consul.kautuk@gmail.com> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
3f79768f23
commit
f1db7afd91
1 changed files with 4 additions and 5 deletions
|
@ -2378,7 +2378,7 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
|
|||
vms = kzalloc(sizeof(vms[0]) * nr_vms, GFP_KERNEL);
|
||||
vas = kzalloc(sizeof(vas[0]) * nr_vms, GFP_KERNEL);
|
||||
if (!vas || !vms)
|
||||
goto err_free;
|
||||
goto err_free2;
|
||||
|
||||
for (area = 0; area < nr_vms; area++) {
|
||||
vas[area] = kzalloc(sizeof(struct vmap_area), GFP_KERNEL);
|
||||
|
@ -2476,11 +2476,10 @@ found:
|
|||
|
||||
err_free:
|
||||
for (area = 0; area < nr_vms; area++) {
|
||||
if (vas)
|
||||
kfree(vas[area]);
|
||||
if (vms)
|
||||
kfree(vms[area]);
|
||||
kfree(vas[area]);
|
||||
kfree(vms[area]);
|
||||
}
|
||||
err_free2:
|
||||
kfree(vas);
|
||||
kfree(vms);
|
||||
return NULL;
|
||||
|
|
Loading…
Reference in a new issue