From: Joe Perches <joe@perches.com>
To: YueHaibing <yuehaibing@huawei.com>,
johannes.berg@intel.com, emmanuel.grumbach@intel.com,
luciano.coelho@intel.com, linuxwifi@intel.com,
kvalo@codeaurora.org
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-wireless@vger.kernel.org
Subject: Re: [PATCH 2/2] iwlwifi: Use struct_size() in kzalloc
Date: Mon, 28 Jan 2019 13:57:45 -0800 [thread overview]
Message-ID: <9a66aa07870c729ad0e65ac26a2404fac879f290.camel@perches.com> (raw)
In-Reply-To: <20190128064432.17576-3-yuehaibing@huawei.com>
On Mon, 2019-01-28 at 14:44 +0800, YueHaibing wrote:
> Use struct_size() in kzalloc instead of the 'regd_to_copy'
There is also the use above that in the same function
that could also be converted.
/* build a regdomain rule for every valid channel */
size_of_regd =
sizeof(struct ieee80211_regdomain) +
num_of_ch * sizeof(struct ieee80211_reg_rule);
regd = kzalloc(size_of_regd, GFP_KERNEL);
if (!regd)
return ERR_PTR(-ENOMEM);
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
[]
> @@ -1093,7 +1093,7 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
> const u8 *nvm_chan = cfg->nvm_type == IWL_NVM_EXT ?
> iwl_ext_nvm_channels : iwl_nvm_channels;
> struct ieee80211_regdomain *regd, *copy_rd;
> - int size_of_regd, regd_to_copy;
> + int size_of_regd;
> struct ieee80211_reg_rule *rule;
> struct regdb_ptrs *regdb_ptrs;
> enum nl80211_band band;
> @@ -1193,10 +1193,8 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg,
> * Narrow down regdom for unused regulatory rules to prevent hole
> * between reg rules to wmm rules.
> */
> - regd_to_copy = sizeof(struct ieee80211_regdomain) +
> - valid_rules * sizeof(struct ieee80211_reg_rule);
> -
> - copy_rd = kmemdup(regd, regd_to_copy, GFP_KERNEL);
> + copy_rd = kmemdup(regd, struct_size(regd, reg_rules, valid_rules),
> + GFP_KERNEL);
> if (!copy_rd)
> copy_rd = ERR_PTR(-ENOMEM);
>
next prev parent reply other threads:[~2019-01-28 21:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-28 6:44 [PATCH 0/2] cleanup for iwlwifi YueHaibing
2019-01-28 6:44 ` [PATCH 1/2] iwlwifi: Use kmemdup instead of duplicating its function YueHaibing
2019-01-28 6:44 ` [PATCH 2/2] iwlwifi: Use struct_size() in kzalloc YueHaibing
2019-01-28 21:57 ` Joe Perches [this message]
2019-01-29 3:13 ` YueHaibing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a66aa07870c729ad0e65ac26a2404fac879f290.camel@perches.com \
--to=joe@perches.com \
--cc=emmanuel.grumbach@intel.com \
--cc=johannes.berg@intel.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxwifi@intel.com \
--cc=luciano.coelho@intel.com \
--cc=netdev@vger.kernel.org \
--cc=yuehaibing@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).