Skip to contentSkip to conversation

ath6kl: debug: Use struct_size() helper

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

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

PATCH 1/1 ath6kl: debug: 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, change the following form:

sizeof(*tbl) + num_entries * sizeof(struct wmi_bss_roam_info)

to :

struct_size(tbl, info, num_entries)

This code was detected with the help of Coccinelle.

---
 drivers/net/wireless/ath/ath6kl/debug.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/ath/ath6kl/debug.c +1 -2
index 4e94b22eaada..54337d60f288 100644
@@ -1132,8 +1132,7 @@ int ath6kl_debug_roam_tbl_event(struct ath6kl *ar, const void *buf,
 
 	tbl = (const struct wmi_target_roam_tbl *) buf;
 	num_entries = le16_to_cpu(tbl->num_entries);
-	if (sizeof(*tbl) + num_entries * sizeof(struct wmi_bss_roam_info) >
-	    len)
+	if (struct_size(tbl, info, num_entries) > len)
 		return -EINVAL;
 
 	if (ar->debug.roam_tbl == NULL ||
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, change the following form:

sizeof(*tbl) + num_entries * sizeof(struct wmi_bss_roam_info)

Quoted 8 lines

to :

struct_size(tbl, info, num_entries)

This code was detected with the help of Coccinelle.

Patch applied to ath-next branch of ath.git, thanks.

df75786b9233 ath6kl: debug: Use struct_size() helper

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

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