Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0ac477b authored by Markus Elfring's avatar Markus Elfring Committed by Paul Mackerras
Browse files

KVM: PPC: e500: Replace kzalloc() calls by kcalloc() in two functions 



* A multiplication for the size determination of a memory allocation
  indicated that an array data structure should be processed.
  Thus use the corresponding function "kcalloc".

  Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>

  This issue was detected also by using the Coccinelle software.

* Replace the specification of data structures by pointer dereferences
  to make the corresponding size determination a bit safer according to
  the Linux coding style convention.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent cfb60813

arch/powerpc/kvm/e500_mmu.c

+11 −12
Original line number Diff line number Diff line
@@ -799,21 +799,20 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu, 
		goto put_pages;

	}



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

			   GFP_KERNEL);

	privs[0] = kcalloc(params.tlb_sizes[0], sizeof(*privs[0]), GFP_KERNEL);

	if (!privs[0]) {

		ret = -ENOMEM;

		goto put_pages;

	}



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

			   GFP_KERNEL);

	privs[1] = kcalloc(params.tlb_sizes[1], sizeof(*privs[1]), GFP_KERNEL);

	if (!privs[1]) {

		ret = -ENOMEM;

		goto free_privs_first;

	}



	g2h_bitmap = kzalloc(sizeof(u64) * params.tlb_sizes[1],

	g2h_bitmap = kcalloc(params.tlb_sizes[1],

			     sizeof(*g2h_bitmap),

			     GFP_KERNEL);

	if (!g2h_bitmap) {

		ret = -ENOMEM;
@@ -929,20 +928,20 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) 
	vcpu_e500->gtlb_offset[0] = 0;

	vcpu_e500->gtlb_offset[1] = KVM_E500_TLB0_SIZE;



	vcpu_e500->gtlb_priv[0] = kzalloc(sizeof(struct tlbe_ref) *

					  vcpu_e500->gtlb_params[0].entries,

	vcpu_e500->gtlb_priv[0] = kcalloc(vcpu_e500->gtlb_params[0].entries,

					  sizeof(struct tlbe_ref),

					  GFP_KERNEL);

	if (!vcpu_e500->gtlb_priv[0])

		goto err;



	vcpu_e500->gtlb_priv[1] = kzalloc(sizeof(struct tlbe_ref) *

					  vcpu_e500->gtlb_params[1].entries,

	vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries,

					  sizeof(struct tlbe_ref),

					  GFP_KERNEL);

	if (!vcpu_e500->gtlb_priv[1])

		goto err;



	vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(u64) *

					  vcpu_e500->gtlb_params[1].entries,

	vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries,

					  sizeof(*vcpu_e500->g2h_tlb1_map),

					  GFP_KERNEL);

	if (!vcpu_e500->g2h_tlb1_map)

		goto err;