* [PATCH] i3c/master/mipi-i3c-hci: Prefer struct_size over open coded arithmetic
@ 2021-09-05 14:40 Len Baker
2021-09-06 4:30 ` Nicolas Pitre
2021-09-13 17:39 ` Alexandre Belloni
0 siblings, 2 replies; 3+ messages in thread
From: Len Baker @ 2021-09-05 14:40 UTC (permalink / raw)
To: Boris Brezillon, Nicolas Pitre
Cc: Len Baker, Kees Cook, linux-i3c, linux-hardening, linux-kernel
As noted in the "Deprecated Interfaces, Language Features, Attributes,
and Conventions" documentation [1], size calculations (especially
multiplication) should not be performed in memory allocator (or similar)
function arguments due to the risk of them overflowing. This could lead
to values wrapping around and a smaller allocation being made than the
caller was expecting. Using those allocations could lead to linear
overflows of heap memory and other misbehaviors.
So, use the struct_size() helper to do the arithmetic instead of the
argument "size + count * size" in the kzalloc() function.
[1] https://www.kernel.org/doc/html/v5.14/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments
Signed-off-by: Len Baker <len.baker@gmx.com>
---
drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c
index af873a9be050..2990ac9eaade 100644
--- a/drivers/i3c/master/mipi-i3c-hci/dma.c
+++ b/drivers/i3c/master/mipi-i3c-hci/dma.c
@@ -223,7 +223,7 @@ static int hci_dma_init(struct i3c_hci *hci)
}
if (nr_rings > XFER_RINGS)
nr_rings = XFER_RINGS;
- rings = kzalloc(sizeof(*rings) + nr_rings * sizeof(*rh), GFP_KERNEL);
+ rings = kzalloc(struct_size(rings, headers, nr_rings), GFP_KERNEL);
if (!rings)
return -ENOMEM;
hci->io_data = rings;
--
2.25.1
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] i3c/master/mipi-i3c-hci: Prefer struct_size over open coded arithmetic
2021-09-05 14:40 [PATCH] i3c/master/mipi-i3c-hci: Prefer struct_size over open coded arithmetic Len Baker
@ 2021-09-06 4:30 ` Nicolas Pitre
2021-09-13 17:39 ` Alexandre Belloni
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Pitre @ 2021-09-06 4:30 UTC (permalink / raw)
To: Len Baker
Cc: Boris Brezillon, Kees Cook, linux-i3c, linux-hardening, linux-kernel
On Sun, 5 Sep 2021, Len Baker wrote:
> As noted in the "Deprecated Interfaces, Language Features, Attributes,
> and Conventions" documentation [1], size calculations (especially
> multiplication) should not be performed in memory allocator (or similar)
> function arguments due to the risk of them overflowing. This could lead
> to values wrapping around and a smaller allocation being made than the
> caller was expecting. Using those allocations could lead to linear
> overflows of heap memory and other misbehaviors.
>
> So, use the struct_size() helper to do the arithmetic instead of the
> argument "size + count * size" in the kzalloc() function.
>
> [1] https://www.kernel.org/doc/html/v5.14/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments
>
> Signed-off-by: Len Baker <len.baker@gmx.com>
Acked-by: Nicolas Pitre <npitre@baylibre.com>
> ---
> drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c
> index af873a9be050..2990ac9eaade 100644
> --- a/drivers/i3c/master/mipi-i3c-hci/dma.c
> +++ b/drivers/i3c/master/mipi-i3c-hci/dma.c
> @@ -223,7 +223,7 @@ static int hci_dma_init(struct i3c_hci *hci)
> }
> if (nr_rings > XFER_RINGS)
> nr_rings = XFER_RINGS;
> - rings = kzalloc(sizeof(*rings) + nr_rings * sizeof(*rh), GFP_KERNEL);
> + rings = kzalloc(struct_size(rings, headers, nr_rings), GFP_KERNEL);
> if (!rings)
> return -ENOMEM;
> hci->io_data = rings;
> --
> 2.25.1
>
>
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] i3c/master/mipi-i3c-hci: Prefer struct_size over open coded arithmetic
2021-09-05 14:40 [PATCH] i3c/master/mipi-i3c-hci: Prefer struct_size over open coded arithmetic Len Baker
2021-09-06 4:30 ` Nicolas Pitre
@ 2021-09-13 17:39 ` Alexandre Belloni
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre Belloni @ 2021-09-13 17:39 UTC (permalink / raw)
To: Len Baker, Nicolas Pitre, Boris Brezillon
Cc: Alexandre Belloni, linux-hardening, linux-kernel, linux-i3c, Kees Cook
On Sun, 5 Sep 2021 16:40:54 +0200, Len Baker wrote:
> As noted in the "Deprecated Interfaces, Language Features, Attributes,
> and Conventions" documentation [1], size calculations (especially
> multiplication) should not be performed in memory allocator (or similar)
> function arguments due to the risk of them overflowing. This could lead
> to values wrapping around and a smaller allocation being made than the
> caller was expecting. Using those allocations could lead to linear
> overflows of heap memory and other misbehaviors.
>
> [...]
Applied, thanks!
[1/1] i3c/master/mipi-i3c-hci: Prefer struct_size over open coded arithmetic
commit: 605fa23646dd9a86c4300e1719542a865111d1b6
Best regards,
--
Alexandre Belloni <alexandre.belloni@bootlin.com>
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-13 17:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-05 14:40 [PATCH] i3c/master/mipi-i3c-hci: Prefer struct_size over open coded arithmetic Len Baker
2021-09-06 4:30 ` Nicolas Pitre
2021-09-13 17:39 ` Alexandre Belloni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).