2024-03-04 16:07:34

by David Lechner

Subject: [PATCH v2 3/3] spi: axi-spi-engine: use struct_size() macro

This makes use of the struct_size() macro to calculate the size of the
struct axi_spi_engine when allocating it.

Suggested-by: Christophe JAILLET <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
Signed-off-by: David Lechner <[email protected]>
---
drivers/spi/spi-axi-spi-engine.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c
index a8f626165f44..7cc219d78551 100644
--- a/drivers/spi/spi-axi-spi-engine.c
+++ b/drivers/spi/spi-axi-spi-engine.c
@@ -12,6 +12,7 @@
#include <linux/io.h>
#include <linux/of.h>
#include <linux/module.h>
+#include <linux/overflow.h>
#include <linux/platform_device.h>
#include <linux/spi/spi.h>

@@ -502,15 +503,13 @@ static irqreturn_t spi_engine_irq(int irq, void *devid)
static int spi_engine_optimize_message(struct spi_message *msg)
{
struct spi_engine_program p_dry, *p;
- size_t size;

spi_engine_precompile_message(msg);

p_dry.length = 0;
spi_engine_compile_message(msg, true, &p_dry);

- size = sizeof(*p->instructions) * (p_dry.length + 1);
- p = kzalloc(sizeof(*p) + size, GFP_KERNEL);
+ p = kzalloc(struct_size(p, instructions, p_dry.length + 1), GFP_KERNEL);
if (!p)
return -ENOMEM;


--
2.43.2

2024-03-04 16:17:09

by Gustavo A. R. Silva

Subject: Re: [PATCH v2 3/3] spi: axi-spi-engine: use struct_size() macro

On 04/03/24 10:04, David Lechner wrote:
> This makes use of the struct_size() macro to calculate the size of the
> struct axi_spi_engine when allocating it.
>
> Suggested-by: Christophe JAILLET <[email protected]>
> Reviewed-by: Kees Cook <[email protected]>
> Signed-off-by: David Lechner <[email protected]>

Reviewed-by: Gustavo A. R. Silva <[email protected]>

Thanks
--
Gustavo

> ---
> drivers/spi/spi-axi-spi-engine.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c
> index a8f626165f44..7cc219d78551 100644
> --- a/drivers/spi/spi-axi-spi-engine.c
> +++ b/drivers/spi/spi-axi-spi-engine.c
> @@ -12,6 +12,7 @@
> #include <linux/io.h>
> #include <linux/of.h>
> #include <linux/module.h>
> +#include <linux/overflow.h>
> #include <linux/platform_device.h>
> #include <linux/spi/spi.h>
>
> @@ -502,15 +503,13 @@ static irqreturn_t spi_engine_irq(int irq, void *devid)
> static int spi_engine_optimize_message(struct spi_message *msg)
> {
> struct spi_engine_program p_dry, *p;
> - size_t size;
>
> spi_engine_precompile_message(msg);
>
> p_dry.length = 0;
> spi_engine_compile_message(msg, true, &p_dry);
>
> - size = sizeof(*p->instructions) * (p_dry.length + 1);
> - p = kzalloc(sizeof(*p) + size, GFP_KERNEL);
> + p = kzalloc(struct_size(p, instructions, p_dry.length + 1), GFP_KERNEL);
> if (!p)
> return -ENOMEM;
>
>