arch/powerpc/kvm/e500_tlb.c: fix error return code
Convert a 0 error return code to a negative one, as returned elsewhere in the function. A new label is also added to avoid freeing things that are known to not yet be allocated. A simplified version of the semantic match that finds the first problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier ret; expression e,e1,e2,e3,e4,x; @@ ( if (\(ret != 0\|ret < 0\) || ...) { ... return ...; } | ret = 0 ) ... when != ret = e1 *x = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\|ioremap\|ioremap_nocache\|devm_ioremap\|devm_ioremap_nocache\)(...); ... when != x = e2 when != ret = e3 *if (x == NULL || ...) { ... when != ret = e4 * return ret; } // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
55b665b026
commit
12ecd9570d
|
@ -1233,21 +1233,27 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu,
|
||||||
}
|
}
|
||||||
|
|
||||||
virt = vmap(pages, num_pages, VM_MAP, PAGE_KERNEL);
|
virt = vmap(pages, num_pages, VM_MAP, PAGE_KERNEL);
|
||||||
if (!virt)
|
if (!virt) {
|
||||||
|
ret = -ENOMEM;
|
||||||
goto err_put_page;
|
goto err_put_page;
|
||||||
|
}
|
||||||
|
|
||||||
privs[0] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[0],
|
privs[0] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[0],
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
privs[1] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[1],
|
privs[1] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[1],
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
|
||||||
if (!privs[0] || !privs[1])
|
if (!privs[0] || !privs[1]) {
|
||||||
goto err_put_page;
|
ret = -ENOMEM;
|
||||||
|
goto err_privs;
|
||||||
|
}
|
||||||
|
|
||||||
g2h_bitmap = kzalloc(sizeof(u64) * params.tlb_sizes[1],
|
g2h_bitmap = kzalloc(sizeof(u64) * params.tlb_sizes[1],
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!g2h_bitmap)
|
if (!g2h_bitmap) {
|
||||||
goto err_put_page;
|
ret = -ENOMEM;
|
||||||
|
goto err_privs;
|
||||||
|
}
|
||||||
|
|
||||||
free_gtlb(vcpu_e500);
|
free_gtlb(vcpu_e500);
|
||||||
|
|
||||||
|
@ -1287,10 +1293,11 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu,
|
||||||
kvmppc_recalc_tlb1map_range(vcpu_e500);
|
kvmppc_recalc_tlb1map_range(vcpu_e500);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_put_page:
|
err_privs:
|
||||||
kfree(privs[0]);
|
kfree(privs[0]);
|
||||||
kfree(privs[1]);
|
kfree(privs[1]);
|
||||||
|
|
||||||
|
err_put_page:
|
||||||
for (i = 0; i < num_pages; i++)
|
for (i = 0; i < num_pages; i++)
|
||||||
put_page(pages[i]);
|
put_page(pages[i]);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue