On 2019/1/27 5:24, Joe Perches wrote:
> On Sat, 2019-01-26 at 20:42 +0800, YueHaibing wrote:
>> Use kmemdup rather than duplicating its implementation
> []
>> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
> []
>> @@ -1196,13 +1196,9 @@ 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);
>> - if (!copy_rd) {
>> + copy_rd = kmemdup(regd, regd_to_copy, GFP_KERNEL);
>
> This should probably be
>
> copy_rd = kmemdup(regd, struct_size(regd, reg_rules, valid_rules),
> GFP_KERNEL);
>
Yes, So also can remove 'regd_to_copy', I will do it in a new patch
Thanks!
>> + if (!copy_rd)
>> copy_rd = ERR_PTR(-ENOMEM);
>> - goto out;
>> - }
>> -
>> - memcpy(copy_rd, regd, regd_to_copy);
>>
>> out:
>> kfree(regdb_ptrs);
>
>
> .
>
