brcmfmac: Replace zero-length array with flexible array member

Len Baker · Kalle Valo · commit 3fd445a4d49f · 2021-09-24T14:20:44.000+03:00
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use "flexible array members"[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. Also, make use of the struct_size() helper in devm_kzalloc(). [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/v5.14/process/deprecated.html#zero-length-and-one-element-arrays Signed-off-by: Len Baker <len.baker@gmx.com> Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20210904092217.2848-1-len.baker@gmx.com
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
@@ -29,7 +29,7 @@ static int brcmf_of_get_country_codes(struct device *dev,
 		return (count == -EINVAL) ? 0 : count;
 	}
 
-	cc = devm_kzalloc(dev, sizeof(*cc) + count * sizeof(*cce), GFP_KERNEL);
+	cc = devm_kzalloc(dev, struct_size(cc, table, count), GFP_KERNEL);
 	if (!cc)
 		return -ENOMEM;
 
diff --git a/include/linux/platform_data/brcmfmac.h b/include/linux/platform_data/brcmfmac.h
@@ -125,7 +125,7 @@ struct brcmfmac_pd_cc_entry {
  */
 struct brcmfmac_pd_cc {
 	int				table_size;
-	struct brcmfmac_pd_cc_entry	table[0];
+	struct brcmfmac_pd_cc_entry	table[];
 };
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static int brcmf_of_get_country_codes(struct device *dev,`
`29`	`29`	`return (count == -EINVAL) ? 0 : count;`
`30`	`30`	`}`
`31`	`31`
`32`		`- cc = devm_kzalloc(dev, sizeof(cc) + count sizeof(*cce), GFP_KERNEL);`
	`32`	`+ cc = devm_kzalloc(dev, struct_size(cc, table, count), GFP_KERNEL);`
`33`	`33`	`if (!cc)`
`34`	`34`	`return -ENOMEM;`
`35`	`35`