[PATCH V2] drivers/firewire: use struct_size over open coded arithmetic

From: cgel . zte
Date: Thu Feb 10 2022 - 01:08:21 EST


From: "Minghao Chi (CGEL ZTE)" <chi.minghao@xxxxxxxxxx>

Replace zero-length array with flexible-array member and make use
of the struct_size() helper in kmalloc(). For example:

struct fw_request {
...
u32 data[];
}

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.

Signed-off-by: Minghao Chi (CGEL ZTE) <chi.minghao@xxxxxxxxxx>
---
drivers/firewire/core-transaction.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index ac487c96bb71..563fdf8b2657 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -777,7 +777,7 @@ static struct fw_request *allocate_request(struct fw_card *card,
return NULL;
}

- request = kmalloc(sizeof(*request) + length, GFP_ATOMIC);
+ request = kmalloc(struct_size(request, data, length), GFP_ATOMIC);
if (request == NULL)
return NULL;

--
2.25.1