Commit 778e1cdd authored Jun 12, 2018 by Kees Cook

treewide: kvzalloc() -> kvcalloc()



The kvzalloc() function has a 2-factor argument form, kvcalloc(). This
patch replaces cases of:

        kvzalloc(a * b, gfp)

with:
        kvcalloc(a * b, gfp)

as well as handling cases of:

        kvzalloc(a * b * c, gfp)

with:

        kvzalloc(array3_size(a, b, c), gfp)

as it's slightly less ugly than:

        kvcalloc(array_size(a, b), c, gfp)

This does, however, attempt to ignore constant size factors like:

        kvzalloc(4 * 1024, gfp)

though any constants defined via macros get caught up in the conversion.

Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.

The Coccinelle script used for this was:

// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@

(
  kvzalloc(
-	(sizeof(TYPE)) * E
+	sizeof(TYPE) * E
  , ...)
|
  kvzalloc(
-	(sizeof(THING)) * E
+	sizeof(THING) * E
  , ...)
)

// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@

(
  kvzalloc(
-	sizeof(u8) * (COUNT)
+	COUNT
  , ...)
|
  kvzalloc(
-	sizeof(__u8) * (COUNT)
+	COUNT
  , ...)
|
  kvzalloc(
-	sizeof(char) * (COUNT)
+	COUNT
  , ...)
|
  kvzalloc(
-	sizeof(unsigned char) * (COUNT)
+	COUNT
  , ...)
|
  kvzalloc(
-	sizeof(u8) * COUNT
+	COUNT
  , ...)
|
  kvzalloc(
-	sizeof(__u8) * COUNT
+	COUNT
  , ...)
|
  kvzalloc(
-	sizeof(char) * COUNT
+	COUNT
  , ...)
|
  kvzalloc(
-	sizeof(unsigned char) * COUNT
+	COUNT
  , ...)
)

// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@

(
- kvzalloc
+ kvcalloc
  (
-	sizeof(TYPE) * (COUNT_ID)
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(TYPE) * COUNT_ID
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(TYPE) * (COUNT_CONST)
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(TYPE) * COUNT_CONST
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(THING) * (COUNT_ID)
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(THING) * COUNT_ID
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(THING) * (COUNT_CONST)
+	COUNT_CONST, sizeof(THING)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(THING) * COUNT_CONST
+	COUNT_CONST, sizeof(THING)
  , ...)
)

// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@

- kvzalloc
+ kvcalloc
  (
-	SIZE * COUNT
+	COUNT, SIZE
  , ...)

// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@

(
  kvzalloc(
-	sizeof(TYPE) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kvzalloc(
-	sizeof(TYPE) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kvzalloc(
-	sizeof(TYPE) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kvzalloc(
-	sizeof(TYPE) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kvzalloc(
-	sizeof(THING) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kvzalloc(
-	sizeof(THING) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kvzalloc(
-	sizeof(THING) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kvzalloc(
-	sizeof(THING) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
)

// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@

(
  kvzalloc(
-	sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kvzalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kvzalloc(
-	sizeof(THING1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kvzalloc(
-	sizeof(THING1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kvzalloc(
-	sizeof(TYPE1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
|
  kvzalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
)

// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@

(
  kvzalloc(
-	(COUNT) * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kvzalloc(
-	COUNT * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kvzalloc(
-	COUNT * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kvzalloc(
-	(COUNT) * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kvzalloc(
-	COUNT * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kvzalloc(
-	(COUNT) * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kvzalloc(
-	(COUNT) * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kvzalloc(
-	COUNT * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
)

// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@

(
  kvzalloc(C1 * C2 * C3, ...)
|
  kvzalloc(
-	(E1) * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kvzalloc(
-	(E1) * (E2) * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kvzalloc(
-	(E1) * (E2) * (E3)
+	array3_size(E1, E2, E3)
  , ...)
|
  kvzalloc(
-	E1 * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
)

// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@

(
  kvzalloc(sizeof(THING) * C2, ...)
|
  kvzalloc(sizeof(TYPE) * C2, ...)
|
  kvzalloc(C1 * C2 * C3, ...)
|
  kvzalloc(C1 * C2, ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(TYPE) * (E2)
+	E2, sizeof(TYPE)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(TYPE) * E2
+	E2, sizeof(TYPE)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(THING) * (E2)
+	E2, sizeof(THING)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	sizeof(THING) * E2
+	E2, sizeof(THING)
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	(E1) * E2
+	E1, E2
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	(E1) * (E2)
+	E1, E2
  , ...)
|
- kvzalloc
+ kvcalloc
  (
-	E1 * E2
+	E1, E2
  , ...)
)

Signed-off-by: Kees Cook <keescook@chromium.org>

parent 344476e1

arch/x86/kvm/page_track.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,9 @@ int kvm_page_track_create_memslot(struct kvm_memory_slot *slot,
		int i;

		for (i = 0; i < KVM_PAGE_TRACK_MAX; i++) {
		slot->arch.gfn_track[i] = kvzalloc(npages *
		sizeof(*slot->arch.gfn_track[i]), GFP_KERNEL);
		slot->arch.gfn_track[i] =
		kvcalloc(npages, sizeof(*slot->arch.gfn_track[i]),
		GFP_KERNEL);
		if (!slot->arch.gfn_track[i])
		goto track_free;
		}

arch/x86/kvm/x86.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -8871,13 +8871,14 @@ int kvm_arch_create_memslot(struct kvm kvm, struct kvm_memory_slot slot,
		slot->base_gfn, level) + 1;

		slot->arch.rmap[i] =
		kvzalloc(lpages * sizeof(*slot->arch.rmap[i]), GFP_KERNEL);
		kvcalloc(lpages, sizeof(*slot->arch.rmap[i]),
		GFP_KERNEL);
		if (!slot->arch.rmap[i])
		goto out_free;
		if (i == 0)
		continue;

		linfo = kvzalloc(lpages * sizeof(*linfo), GFP_KERNEL);
		linfo = kvcalloc(lpages, sizeof(*linfo), GFP_KERNEL);
		if (!linfo)
		goto out_free;

drivers/gpu/drm/amd/display/modules/color/color_gamma.c

+21 −16

Original line number	Diff line number	Diff line
		@@ -1274,19 +1274,22 @@ bool mod_color_calculate_regamma_params(struct dc_transfer_func *output_tf,

		output_tf->type = TF_TYPE_DISTRIBUTED_POINTS;

		rgb_user = kvzalloc(sizeof(rgb_user) (ramp->num_entries + _EXTRA_POINTS),
		rgb_user = kvcalloc(ramp->num_entries + _EXTRA_POINTS,
		sizeof(*rgb_user),
		GFP_KERNEL);
		if (!rgb_user)
		goto rgb_user_alloc_fail;
		rgb_regamma = kvzalloc(sizeof(rgb_regamma) (MAX_HW_POINTS + _EXTRA_POINTS),
		rgb_regamma = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS,
		sizeof(*rgb_regamma),
		GFP_KERNEL);
		if (!rgb_regamma)
		goto rgb_regamma_alloc_fail;
		axix_x = kvzalloc(sizeof(axix_x) (ramp->num_entries + 3),
		axix_x = kvcalloc(ramp->num_entries + 3, sizeof(*axix_x),
		GFP_KERNEL);
		if (!axix_x)
		goto axix_x_alloc_fail;
		coeff = kvzalloc(sizeof(coeff) (MAX_HW_POINTS + _EXTRA_POINTS), GFP_KERNEL);
		coeff = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS, sizeof(*coeff),
		GFP_KERNEL);
		if (!coeff)
		goto coeff_alloc_fail;

		@@ -1482,19 +1485,21 @@ bool mod_color_calculate_degamma_params(struct dc_transfer_func *input_tf,

		input_tf->type = TF_TYPE_DISTRIBUTED_POINTS;

		rgb_user = kvzalloc(sizeof(rgb_user) (ramp->num_entries + _EXTRA_POINTS),
		rgb_user = kvcalloc(ramp->num_entries + _EXTRA_POINTS,
		sizeof(*rgb_user),
		GFP_KERNEL);
		if (!rgb_user)
		goto rgb_user_alloc_fail;
		curve = kvzalloc(sizeof(curve) (MAX_HW_POINTS + _EXTRA_POINTS),
		curve = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS, sizeof(*curve),
		GFP_KERNEL);
		if (!curve)
		goto curve_alloc_fail;
		axix_x = kvzalloc(sizeof(axix_x) (ramp->num_entries + _EXTRA_POINTS),
		axix_x = kvcalloc(ramp->num_entries + _EXTRA_POINTS, sizeof(*axix_x),
		GFP_KERNEL);
		if (!axix_x)
		goto axix_x_alloc_fail;
		coeff = kvzalloc(sizeof(coeff) (MAX_HW_POINTS + _EXTRA_POINTS), GFP_KERNEL);
		coeff = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS, sizeof(*coeff),
		GFP_KERNEL);
		if (!coeff)
		goto coeff_alloc_fail;

		@@ -1571,8 +1576,8 @@ bool mod_color_calculate_curve(enum dc_transfer_func_predefined trans,
		}
		ret = true;
		} else if (trans == TRANSFER_FUNCTION_PQ) {
		rgb_regamma = kvzalloc(sizeof(rgb_regamma)
		(MAX_HW_POINTS + _EXTRA_POINTS),
		rgb_regamma = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS,
		sizeof(*rgb_regamma),
		GFP_KERNEL);
		if (!rgb_regamma)
		goto rgb_regamma_alloc_fail;
		@@ -1596,8 +1601,8 @@ bool mod_color_calculate_curve(enum dc_transfer_func_predefined trans,
		kvfree(rgb_regamma);
		} else if (trans == TRANSFER_FUNCTION_SRGB \|\|
		trans == TRANSFER_FUNCTION_BT709) {
		rgb_regamma = kvzalloc(sizeof(rgb_regamma)
		(MAX_HW_POINTS + _EXTRA_POINTS),
		rgb_regamma = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS,
		sizeof(*rgb_regamma),
		GFP_KERNEL);
		if (!rgb_regamma)
		goto rgb_regamma_alloc_fail;
		@@ -1640,8 +1645,8 @@ bool mod_color_calculate_degamma_curve(enum dc_transfer_func_predefined trans,
		}
		ret = true;
		} else if (trans == TRANSFER_FUNCTION_PQ) {
		rgb_degamma = kvzalloc(sizeof(rgb_degamma)
		(MAX_HW_POINTS + _EXTRA_POINTS),
		rgb_degamma = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS,
		sizeof(*rgb_degamma),
		GFP_KERNEL);
		if (!rgb_degamma)
		goto rgb_degamma_alloc_fail;
		@@ -1660,8 +1665,8 @@ bool mod_color_calculate_degamma_curve(enum dc_transfer_func_predefined trans,
		kvfree(rgb_degamma);
		} else if (trans == TRANSFER_FUNCTION_SRGB \|\|
		trans == TRANSFER_FUNCTION_BT709) {
		rgb_degamma = kvzalloc(sizeof(rgb_degamma)
		(MAX_HW_POINTS + _EXTRA_POINTS),
		rgb_degamma = kvcalloc(MAX_HW_POINTS + _EXTRA_POINTS,
		sizeof(*rgb_degamma),
		GFP_KERNEL);
		if (!rgb_degamma)
		goto rgb_degamma_alloc_fail;

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ nvkm_vmm_pt_new(const struct nvkm_vmm_desc *desc, bool sparse,
		pgt->sparse = sparse;

		if (desc->type == PGD) {
		pgt->pde = kvzalloc(sizeof(pgt->pde) pten, GFP_KERNEL);
		pgt->pde = kvcalloc(pten, sizeof(*pgt->pde), GFP_KERNEL);
		if (!pgt->pde) {
		kfree(pgt);
		return NULL;

drivers/infiniband/hw/mlx5/srq.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ static int create_srq_user(struct ib_pd pd, struct mlx5_ib_srq srq,
		goto err_umem;
		}

		in->pas = kvzalloc(sizeof(in->pas) ncont, GFP_KERNEL);
		in->pas = kvcalloc(ncont, sizeof(*in->pas), GFP_KERNEL);
		if (!in->pas) {
		err = -ENOMEM;
		goto err_umem;
		@@ -189,7 +189,7 @@ static int create_srq_kernel(struct mlx5_ib_dev dev, struct mlx5_ib_srq srq,
		}

		mlx5_ib_dbg(dev, "srq->buf.page_shift = %d\n", srq->buf.page_shift);
		in->pas = kvzalloc(sizeof(in->pas) srq->buf.npages, GFP_KERNEL);
		in->pas = kvcalloc(srq->buf.npages, sizeof(*in->pas), GFP_KERNEL);
		if (!in->pas) {
		err = -ENOMEM;
		goto err_buf;