* [PATCH 0/2] cleanup for iwlwifi
@ 2019-01-28 6:44 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
0 siblings, 2 replies; 5+ messages in thread
From: YueHaibing @ 2019-01-28 6:44 UTC (permalink / raw)
To: johannes.berg, emmanuel.grumbach, luciano.coelho, linuxwifi, kvalo
Cc: linux-kernel, netdev, linux-wireless, YueHaibing
YueHaibing (2):
iwlwifi: Use kmemdup instead of duplicating its function
iwlwifi: Use struct_size() in kzalloc
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] iwlwifi: Use kmemdup instead of duplicating its function
2019-01-28 6:44 [PATCH 0/2] cleanup for iwlwifi YueHaibing
@ 2019-01-28 6:44 ` YueHaibing
2019-01-28 6:44 ` [PATCH 2/2] iwlwifi: Use struct_size() in kzalloc YueHaibing
1 sibling, 0 replies; 5+ messages in thread
From: YueHaibing @ 2019-01-28 6:44 UTC (permalink / raw)
To: johannes.berg, emmanuel.grumbach, luciano.coelho, linuxwifi, kvalo
Cc: linux-kernel, netdev, linux-wireless, YueHaibing
Use kmemdup rather than duplicating its implementation
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index d9afedc..569cc50 100644
--- 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);
+ if (!copy_rd)
copy_rd = ERR_PTR(-ENOMEM);
- goto out;
- }
-
- memcpy(copy_rd, regd, regd_to_copy);
out:
kfree(regdb_ptrs);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] iwlwifi: Use struct_size() in kzalloc
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 ` YueHaibing
2019-01-28 21:57 ` Joe Perches
1 sibling, 1 reply; 5+ messages in thread
From: YueHaibing @ 2019-01-28 6:44 UTC (permalink / raw)
To: johannes.berg, emmanuel.grumbach, luciano.coelho, linuxwifi, kvalo
Cc: linux-kernel, netdev, linux-wireless, YueHaibing
Use struct_size() in kzalloc instead of the 'regd_to_copy'
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index 569cc50..cb9e722 100644
--- 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);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] iwlwifi: Use struct_size() in kzalloc
2019-01-28 6:44 ` [PATCH 2/2] iwlwifi: Use struct_size() in kzalloc YueHaibing
@ 2019-01-28 21:57 ` Joe Perches
2019-01-29 3:13 ` YueHaibing
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2019-01-28 21:57 UTC (permalink / raw)
To: YueHaibing, johannes.berg, emmanuel.grumbach, luciano.coelho,
linuxwifi, kvalo
Cc: linux-kernel, netdev, linux-wireless
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);
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] iwlwifi: Use struct_size() in kzalloc
2019-01-28 21:57 ` Joe Perches
@ 2019-01-29 3:13 ` YueHaibing
0 siblings, 0 replies; 5+ messages in thread
From: YueHaibing @ 2019-01-29 3:13 UTC (permalink / raw)
To: Joe Perches, johannes.berg, emmanuel.grumbach, luciano.coelho,
linuxwifi, kvalo
Cc: linux-kernel, netdev, linux-wireless
On 2019/1/29 5:57, Joe Perches wrote:
> 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);
Thank you, will post v2.
>
>> 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);
>>
>
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-29 3:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2019-01-29 3:13 ` YueHaibing
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.