diff options
| author |   Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-01-08 11:26:32 -0600 |
|---|---|---|
| committer |   Kalle Valo <kvalo@codeaurora.org> | 2019-02-01 14:05:44 +0200 |
| commit | db040dfa53e2905111e400b28d0bd6f38c78d348 (patch) | |
| tree | 17c6076fd87bc64d7525f5b88fb5134d8a7f6f5e /drivers/net/wireless/quantenna/qtnfmac/commands.c | |
| parent | rt2x00: reduce tx power to nominal level on RT6352 (diff) | |
| download | linux-db040dfa53e2905111e400b28d0bd6f38c78d348.tar.xz linux-db040dfa53e2905111e400b28d0bd6f38c78d348.zip | |
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 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>
Diffstat (limited to 'drivers/net/wireless/quantenna/qtnfmac/commands.c')
| -rw-r--r-- | drivers/net/wireless/quantenna/qtnfmac/commands.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/quantenna/qtnfmac/commands.c b/drivers/net/wireless/quantenna/qtnfmac/commands.c index 659e7649fe22..cf386f579060 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/commands.c +++ b/drivers/net/wireless/quantenna/qtnfmac/commands.c @@ -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)) return -E2BIG; - hwinfo->rd = kzalloc(sizeof(*hwinfo->rd) - + sizeof(struct ieee80211_reg_rule) - * resp->n_reg_rules, GFP_KERNEL); + hwinfo->rd = kzalloc(struct_size(hwinfo->rd, reg_rules, + resp->n_reg_rules), GFP_KERNEL); if (!hwinfo->rd) return -ENOMEM; |