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

Commit 0ed2dd03 authored by Kees Cook's avatar Kees Cook
Browse files

treewide: Use struct_size() for devm_kmalloc() and friends 



Replaces open-coded struct size calculations with struct_size() for
devm_*, f2fs_*, and sock_* allocations. Automatically generated (and
manually adjusted) from the following Coccinelle script:

// Direct reference to struct field.
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@

- alloc(HANDLE, sizeof(*VAR) + COUNT * sizeof(*VAR->ELEMENT), GFP)
+ alloc(HANDLE, struct_size(VAR, ELEMENT, COUNT), GFP)

// mr = kzalloc(sizeof(*mr) + m * sizeof(mr->map[0]), GFP_KERNEL);
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
identifier VAR, ELEMENT;
expression COUNT;
@@

- alloc(HANDLE, sizeof(*VAR) + COUNT * sizeof(VAR->ELEMENT[0]), GFP)
+ alloc(HANDLE, struct_size(VAR, ELEMENT, COUNT), GFP)

// Same pattern, but can't trivially locate the trailing element name,
// or variable name.
@@
identifier alloc =~ "devm_kmalloc|devm_kzalloc|sock_kmalloc|f2fs_kmalloc|f2fs_kzalloc";
expression HANDLE;
expression GFP;
expression SOMETHING, COUNT, ELEMENT;
@@

- alloc(HANDLE, sizeof(SOMETHING) + COUNT * sizeof(ELEMENT), GFP)
+ alloc(HANDLE, CHECKME_struct_size(&SOMETHING, ELEMENT, COUNT), GFP)

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent b4b06db1

crypto/af_alg.c

+2 −2
Original line number Diff line number Diff line
@@ -501,8 +501,8 @@ int af_alg_alloc_tsgl(struct sock *sk) 
		sg = sgl->sg;



	if (!sg || sgl->cur >= MAX_SGL_ENTS) {

		sgl = sock_kmalloc(sk, sizeof(*sgl) +

				       sizeof(sgl->sg[0]) * (MAX_SGL_ENTS + 1),

		sgl = sock_kmalloc(sk,

				   struct_size(sgl, sg, (MAX_SGL_ENTS + 1)),

				   GFP_KERNEL);

		if (!sgl)

			return -ENOMEM;

drivers/clk/bcm/clk-bcm2835-aux.c

+4 −2
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ static int bcm2835_aux_clk_probe(struct platform_device *pdev) 
	if (IS_ERR(reg))

		return PTR_ERR(reg);



	onecell = devm_kmalloc(dev, sizeof(*onecell) + sizeof(*onecell->hws) *

			       BCM2835_AUX_CLOCK_COUNT, GFP_KERNEL);

	onecell = devm_kmalloc(dev,

			       struct_size(onecell, hws,

					   BCM2835_AUX_CLOCK_COUNT),

			       GFP_KERNEL);

	if (!onecell)

		return -ENOMEM;

	onecell->num = BCM2835_AUX_CLOCK_COUNT;

drivers/clk/bcm/clk-bcm2835.c

+2 −2
Original line number Diff line number Diff line
@@ -2147,8 +2147,8 @@ static int bcm2835_clk_probe(struct platform_device *pdev) 
	size_t i;

	int ret;



	cprman = devm_kzalloc(dev, sizeof(*cprman) +

			      sizeof(*cprman->onecell.hws) * asize,

	cprman = devm_kzalloc(dev,

			      struct_size(cprman, onecell.hws, asize),

			      GFP_KERNEL);

	if (!cprman)

		return -ENOMEM;

drivers/clk/clk-s2mps11.c

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ static int s2mps11_clk_probe(struct platform_device *pdev) 
	if (!s2mps11_clks)

		return -ENOMEM;



	clk_data = devm_kzalloc(&pdev->dev, sizeof(*clk_data) +

				sizeof(*clk_data->hws) * S2MPS11_CLKS_NUM,

	clk_data = devm_kzalloc(&pdev->dev,

				struct_size(clk_data, hws, S2MPS11_CLKS_NUM),

				GFP_KERNEL);

	if (!clk_data)

		return -ENOMEM;

drivers/clk/clk-scmi.c

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ static int scmi_clocks_probe(struct scmi_device *sdev) 
		return -EINVAL;

	}



	clk_data = devm_kzalloc(dev, sizeof(*clk_data) +

				sizeof(*clk_data->hws) * count, GFP_KERNEL);

	clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, count),

				GFP_KERNEL);

	if (!clk_data)

		return -ENOMEM;