leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtnfmac: use struct_size() in kzalloc()

Browse Source 
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 foo {
    int stuff;
    void *entry[];
};

instance = kzalloc(sizeof(struct foo) + sizeof(void *) * 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, entry, count), GFP_KERNEL);

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Gustavo A. R. Silva 2019-01-08 11:26:32 -06:00 committed by Kalle Valo
parent c2e28ef771
commit db040dfa53
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/quantenna/qtnfmac/commands.c
View File

@ -914,9 +914,8 @@ qtnf_cmd_resp_proc_hw_info(struct qtnf_bus *bus,
if (WARN_ON(resp->n_reg_rules > NL80211_MAX_SUPP_REG_RULES)) if (WARN_ON(resp->n_reg_rules > NL80211_MAX_SUPP_REG_RULES))
return -E2BIG; return -E2BIG;
hwinfo->rd = kzalloc(sizeof(*hwinfo->rd) hwinfo->rd = kzalloc(struct_size(hwinfo->rd, reg_rules,
+ sizeof(struct ieee80211_reg_rule) resp->n_reg_rules), GFP_KERNEL);
* resp->n_reg_rules, GFP_KERNEL);
if (!hwinfo->rd) if (!hwinfo->rd)
return -ENOMEM; return -ENOMEM;