Commit aa8ff35e authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Vinod Koul

dmaengine: at_xdmac: Use struct_size() in devm_kzalloc()

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/160Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20211208001013.GA62330@embeddedorSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent f17e5338
...@@ -2031,7 +2031,7 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev) ...@@ -2031,7 +2031,7 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev)
static int at_xdmac_probe(struct platform_device *pdev) static int at_xdmac_probe(struct platform_device *pdev)
{ {
struct at_xdmac *atxdmac; struct at_xdmac *atxdmac;
int irq, size, nr_channels, i, ret; int irq, nr_channels, i, ret;
void __iomem *base; void __iomem *base;
u32 reg; u32 reg;
...@@ -2056,9 +2056,9 @@ static int at_xdmac_probe(struct platform_device *pdev) ...@@ -2056,9 +2056,9 @@ static int at_xdmac_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
size = sizeof(*atxdmac); atxdmac = devm_kzalloc(&pdev->dev,
size += nr_channels * sizeof(struct at_xdmac_chan); struct_size(atxdmac, chan, nr_channels),
atxdmac = devm_kzalloc(&pdev->dev, size, GFP_KERNEL); GFP_KERNEL);
if (!atxdmac) { if (!atxdmac) {
dev_err(&pdev->dev, "can't allocate at_xdmac structure\n"); dev_err(&pdev->dev, "can't allocate at_xdmac structure\n");
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment