iwlwifi: eeprom-parse: use struct_size() in kzalloc()
Subsystems (3)
PATCH 1/1 iwlwifi: eeprom-parse: 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.
--- drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c +1 -2
@@ -850,8 +850,7 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,if (WARN_ON (!cfg || !cfg->eeprom_params))return NULL ; - data =kzalloc (sizeof (*data) + -sizeof (struct ieee80211_channel ) *IWL_NUM_CHANNELS , + data =kzalloc (struct_size (data, channels,IWL_NUM_CHANNELS ),GFP_KERNEL );if (!data)return NULL ;
Signature · 1 line
2.20.1
Luciano Coelho
AppliedQuoted 18 lines · Gustavo A. R. Silva
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 newstruct_size()helper:
Quoted 6 lines
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 <[email protected]>---
Applied to our internal tree, thanks! It will reach the mainline following our normal upstreaming process.
--
Luca.
Quoted 21 lines · Luciano Coelho
Quoted 20 lines · Gustavo A. R. Silva
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 newstruct_size()helper:instance =
kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
Quoted 8 lines
Quoted 4 lines
This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>---
Applied to our internal tree, thanks! It will reach the mainline following our normal upstreaming process.
Great. :)
Thanks, Luca.
--
Gustavo