| Message ID | 20180906031322.17748-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Luca Coelho |
| Headers | show |
| Series | iwlwifi: Use kmemdup instead of duplicating it in iwl_parse_nvm_mcc_info | expand |
sorry ,there is a typo. Pls ignore this. On 2018/9/6 11:13, YueHaibing wrote: > Replace calls to kmalloc followed by a memcpy with a direct call to > kmemdup. > > Patch found using coccinelle. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c > index 27db4a3..bd91657 100644 > --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c > +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c > @@ -1113,14 +1113,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, > regd_to_copy = sizeof(struct ieee80211_regdomain) + > valid_rules * sizeof(struct ieee80211_reg_rule); > > - copy_rd = kzalloc(regd_to_copy, GFP_KERNEL); > + copy_rd = kmemdup(reg, regd_to_copy, GFP_KERNEL); > if (!copy_rd) { > copy_rd = ERR_PTR(-ENOMEM); > goto out; > } > > - memcpy(copy_rd, regd, regd_to_copy); > - > out: > kfree(regdb_ptrs); > kfree(regd); >
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 27db4a3..bd91657 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -1113,14 +1113,12 @@ iwl_parse_nvm_mcc_info(struct device *dev, const struct iwl_cfg *cfg, regd_to_copy = sizeof(struct ieee80211_regdomain) + valid_rules * sizeof(struct ieee80211_reg_rule); - copy_rd = kzalloc(regd_to_copy, GFP_KERNEL); + copy_rd = kmemdup(reg, regd_to_copy, GFP_KERNEL); if (!copy_rd) { copy_rd = ERR_PTR(-ENOMEM); goto out; } - memcpy(copy_rd, regd, regd_to_copy); - out: kfree(regdb_ptrs); kfree(regd);
Replace calls to kmalloc followed by a memcpy with a direct call to kmemdup. Patch found using coccinelle. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)