qtnfmac: Use struct_size() in kzalloc()
Subsystems (3)
PATCH 1/1 qtnfmac: Use struct_size() in kzalloc()
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct ieee80211_regdomain {
...
struct ieee80211_reg_rule reg_rules[];
};instance = kzalloc(sizeof(*mac->rd) +
sizeof(struct ieee80211_reg_rule) *
count, GFP_KERNEL);Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper:
instance = kzalloc(struct_size(instance, reg_rules, count), GFP_KERNEL);
This code was detected with the help of Coccinelle.
--- drivers/net/wireless/quantenna/qtnfmac/commands.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/quantenna/qtnfmac/commands.c +2 -3
@@ -1011,9 +1011,8 @@ qtnf_parse_variable_mac_info(struct qtnf_wmac *mac,if (WARN_ON (resp->n_reg_rules >NL80211_MAX_SUPP_REG_RULES ))return -E2BIG ; - mac->rd =kzalloc (sizeof (*mac->rd) + -sizeof (struct ieee80211_reg_rule ) * - resp->n_reg_rules,GFP_KERNEL ); + mac->rd =kzalloc (struct_size (mac->rd, reg_rules, resp->n_reg_rules), +GFP_KERNEL );if (!mac->rd)return -ENOMEM ;
Signature · 1 line
2.21.0
Quoted 13 lines
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct ieee80211_regdomain { ... struct ieee80211_reg_rule reg_rules[]; };instance = kzalloc(sizeof(*mac->rd) +
sizeof(struct ieee80211_reg_rule) * count, GFP_KERNEL);
Quoted 8 lines
Instead of leaving these open-coded and prone to type mistakes, we can now use the new
struct_size()helper:instance =
kzalloc(struct_size(instance, reg_rules, count), GFP_KERNEL);This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Hi Gustavo,
Thanks for the patch !
Regards,
Sergey
Quoted 16 lines · Gustavo A. R. Silva
One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example:
struct ieee80211_regdomain { ... struct ieee80211_reg_rule reg_rules[]; };instance = kzalloc(sizeof(*mac->rd) +
sizeof(struct ieee80211_reg_rule) * count, GFP_KERNEL);Instead of leaving these open-coded and prone to type mistakes, we can now use the new
struct_size()helper:
Quoted 6 lines
instance =
kzalloc(struct_size(instance, reg_rules, count), GFP_KERNEL);This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>Reviewed-by Sergey Matyukevich <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
9a1ace64ca3b qtnfmac: Use struct_size() in kzalloc()
Signature · 3 lines
https://patchwork.kernel.org/patch/10982675/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches