| Message ID | 20230821073600.4078584-1-liaoyu15@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 33a0b734543ed5a44135e15f00429b94f75f2866 |
| Headers | show |
| Series | [v2] dmaengine: fsl-edma: use struct_size() helper | expand |
On Mon, 21 Aug 2023 15:36:00 +0800, Yu Liao 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! [1/1] dmaengine: fsl-edma: use struct_size() helper commit: 33a0b734543ed5a44135e15f00429b94f75f2866 Best regards,
diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c index e40769666e39..8c9ee9fc7240 100644 --- a/drivers/dma/fsl-edma.c +++ b/drivers/dma/fsl-edma.c @@ -270,9 +270,8 @@ static int fsl_edma_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct fsl_edma_engine *fsl_edma; const struct fsl_edma_drvdata *drvdata = NULL; - struct fsl_edma_chan *fsl_chan; struct edma_regs *regs; - int len, chans; + int chans; int ret, i; if (of_id) @@ -288,8 +287,8 @@ static int fsl_edma_probe(struct platform_device *pdev) return ret; } - len = sizeof(*fsl_edma) + sizeof(*fsl_chan) * chans; - fsl_edma = devm_kzalloc(&pdev->dev, len, GFP_KERNEL); + fsl_edma = devm_kzalloc(&pdev->dev, struct_size(fsl_edma, chans, chans), + GFP_KERNEL); if (!fsl_edma) return -ENOMEM;
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. Signed-off-by: Yu Liao <liaoyu15@huawei.com> --- v1 -> v2: remove len and use struct_size() in devm_kzmalloc() parameter --- drivers/dma/fsl-edma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)