* [PATCH][next] dmaengine: at_xdmac: Use struct_size() in devm_kzalloc()
@ 2021-12-08 0:10 Gustavo A. R. Silva
2021-12-08 4:55 ` Kees Cook
2021-12-13 5:54 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2021-12-08 0:10 UTC (permalink / raw)
To: Ludovic Desroches, Tudor Ambarus, Vinod Koul
Cc: linux-arm-kernel, dmaengine, linux-kernel, Gustavo A. R. Silva,
linux-hardening
Make use of the struct_size() helper instead of an open-coded version, in
order to avoid any potential type mistakes or integer overflows that, in
the worst scenario, could lead to heap overflows.
Link: https://github.com/KSPP/linux/issues/160
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
drivers/dma/at_xdmac.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index 275a76f188ae..e42dede5b243 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -2031,7 +2031,7 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev)
static int at_xdmac_probe(struct platform_device *pdev)
{
struct at_xdmac *atxdmac;
- int irq, size, nr_channels, i, ret;
+ int irq, nr_channels, i, ret;
void __iomem *base;
u32 reg;
@@ -2056,9 +2056,9 @@ static int at_xdmac_probe(struct platform_device *pdev)
return -EINVAL;
}
- size = sizeof(*atxdmac);
- size += nr_channels * sizeof(struct at_xdmac_chan);
- atxdmac = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
+ atxdmac = devm_kzalloc(&pdev->dev,
+ struct_size(atxdmac, chan, nr_channels),
+ GFP_KERNEL);
if (!atxdmac) {
dev_err(&pdev->dev, "can't allocate at_xdmac structure\n");
return -ENOMEM;
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] dmaengine: at_xdmac: Use struct_size() in devm_kzalloc()
2021-12-08 0:10 [PATCH][next] dmaengine: at_xdmac: Use struct_size() in devm_kzalloc() Gustavo A. R. Silva
@ 2021-12-08 4:55 ` Kees Cook
2021-12-13 5:54 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2021-12-08 4:55 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Ludovic Desroches, Tudor Ambarus, Vinod Koul, linux-arm-kernel,
dmaengine, linux-kernel, linux-hardening
On Tue, Dec 07, 2021 at 06:10:13PM -0600, Gustavo A. R. Silva wrote:
> Make use of the struct_size() helper instead of an open-coded version, in
> order to avoid any potential type mistakes or integer overflows that, in
> the worst scenario, could lead to heap overflows.
>
> Link: https://github.com/KSPP/linux/issues/160
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][next] dmaengine: at_xdmac: Use struct_size() in devm_kzalloc()
2021-12-08 0:10 [PATCH][next] dmaengine: at_xdmac: Use struct_size() in devm_kzalloc() Gustavo A. R. Silva
2021-12-08 4:55 ` Kees Cook
@ 2021-12-13 5:54 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2021-12-13 5:54 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Ludovic Desroches, Tudor Ambarus, linux-arm-kernel, dmaengine,
linux-kernel, linux-hardening
On 07-12-21, 18:10, Gustavo A. R. Silva wrote:
> Make use of the struct_size() helper instead of an open-coded version, in
> order to avoid any potential type mistakes or integer overflows that, in
> the worst scenario, could lead to heap overflows.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-13 5:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-08 0:10 [PATCH][next] dmaengine: at_xdmac: Use struct_size() in devm_kzalloc() Gustavo A. R. Silva
2021-12-08 4:55 ` Kees Cook
2021-12-13 5:54 ` Vinod Koul
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).