arch/powerpc/kvm/e500_tlb.c: fix error return code (12ecd957) · Commits · 戴 / test

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>

arch/powerpc/kvm/e500_tlb.c

+13 −6

Original line number	Diff line number	Diff line
		@@ -1233,21 +1233,27 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu,
		}

		virt = vmap(pages, num_pages, VM_MAP, PAGE_KERNEL);
		if (!virt)
		if (!virt) {
		ret = -ENOMEM;
		goto err_put_page;
		}

		privs[0] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[0],
		GFP_KERNEL);
		privs[1] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[1],
		GFP_KERNEL);

		if (!privs[0] \|\| !privs[1])
		goto err_put_page;
		if (!privs[0] \|\| !privs[1]) {
		ret = -ENOMEM;
		goto err_privs;
		}

		g2h_bitmap = kzalloc(sizeof(u64) * params.tlb_sizes[1],
		GFP_KERNEL);
		if (!g2h_bitmap)
		goto err_put_page;
		if (!g2h_bitmap) {
		ret = -ENOMEM;
		goto err_privs;
		}

		free_gtlb(vcpu_e500);

		@@ -1287,10 +1293,11 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu,
		kvmppc_recalc_tlb1map_range(vcpu_e500);
		return 0;

		err_put_page:
		err_privs:
		kfree(privs[0]);
		kfree(privs[1]);

		err_put_page:
		for (i = 0; i < num_pages; i++)
		put_page(pages[i]);

Admin message