Skip to contentSkip to conversation

zd1211rw: use struct_size() helper

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Apr 3, 2019 – Apr 25, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zd1211rw: use struct_size() helper

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace code of the following form:

sizeof(struct usb_req_write_regs) + count * sizeof(struct reg_data)

with:

struct_size(req, reg_writes, count)

This code was detected with the help of Coccinelle.

---
 drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/zydas/zd1211rw/zd_usb.c +1 -2
index c2cda3acd4af..a094d5b3383c 100644
@@ -1917,8 +1917,7 @@ int zd_usb_iowrite16v_async(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,
 	if (!urb)
 		return -ENOMEM;
 
-	req_len = sizeof(struct usb_req_write_regs) +
-		  count * sizeof(struct reg_data);
+	req_len = struct_size(req, reg_writes, count);
 	req = kmalloc(req_len, GFP_KERNEL);
 	if (!req) {
 		r = -ENOMEM;
Signature · 1 line
2.21.0
#1 lore raw
Quoted 8 lines · Gustavo A. R. Silva

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace code of the following form:

sizeof(struct usb_req_write_regs) + count * sizeof(struct reg_data)

Quoted 7 lines

with:

struct_size(req, reg_writes, count)

This code was detected with the help of Coccinelle.

Patch applied to wireless-drivers-next.git, thanks.

0c7beb2db9a5 zd1211rw: use struct_size() helper

Signature · 3 lines
https://patchwork.kernel.org/patch/10884349/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches