2022-01-24 22:31:40

by Gustavo A. R. Silva

Subject: [PATCH][next] net: mana: Use struct_size() helper in mana_gd_create_dma_region()

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.

Also, address the following sparse warnings:
drivers/net/ethernet/microsoft/mana/gdma_main.c:677:24: warning: using sizeof on a flexible structure

Link: https://github.com/KSPP/linux/issues/174
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
index 636dfef24a6c..49b85ca578b0 100644
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@ -663,7 +663,7 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd,
struct gdma_context *gc = gd->gdma_context;
struct hw_channel_context *hwc;
u32 length = gmi->length;
- u32 req_msg_size;
+ size_t req_msg_size;
int err;
int i;

@@ -674,7 +674,7 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd,
return -EINVAL;

hwc = gc->hwc.driver_data;
- req_msg_size = sizeof(*req) + num_page * sizeof(u64);
+ req_msg_size = struct_size(req, page_addr_list, num_page);
if (req_msg_size > hwc->max_req_msg_size)
return -EINVAL;

--
2.27.0

2022-01-24 22:56:30

by Dexuan Cui

Subject: RE: [PATCH][next] net: mana: Use struct_size() helper in mana_gd_create_dma_region()

> From: Gustavo A. R. Silva <[email protected]>
> Sent: Monday, January 24, 2022 1:44 PM
> ...
> 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.
>
> Also, address the following sparse warnings:
> drivers/net/ethernet/microsoft/mana/gdma_main.c:677:24: warning: using
> sizeof on a flexible structure
> ...
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Reviewed-by: Dexuan Cui <[email protected]>

2022-01-26 03:11:54

by Jakub Kicinski

Subject: Re: [PATCH][next] net: mana: Use struct_size() helper in mana_gd_create_dma_region()

On Mon, 24 Jan 2022 21:47:38 +0000 Dexuan Cui wrote:
> > From: Gustavo A. R. Silva <[email protected]>
> > Sent: Monday, January 24, 2022 1:44 PM
> > ...
> > 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.
> >
> > Also, address the following sparse warnings:
> > drivers/net/ethernet/microsoft/mana/gdma_main.c:677:24: warning: using
> > sizeof on a flexible structure
> > ...
> > Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> Reviewed-by: Dexuan Cui <[email protected]>

Thanks! Applied to net-next, 10cdc794dae8 ("net: mana: Use
struct_size() helper in mana_gd_create_dma_region()")