drivers/net/wireless/intel/iwlwifi/iwl-trans: Replace kzalloc(... strlen()...) with kzalloc_flex()
PATCH 1/1 drivers/net/wireless/intel/iwlwifi/iwl-trans: Replace kzalloc(... strlen()...) with kzalloc_flex()
From: David Laight <[email protected]>
Save the result of the strlen() and use memcpy() instead of strcpy() to copy the string.
---
This is one of a group of patches that remove potentially unbounded strcpy() calls.
They are mostly replaced by strscpy() or, when strlen() has just been called, with memcpy() (usually including the '\0').
Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such.
The changes were made by getting the compiler to detect the calls and then fixing the code by hand.
Note that all the changes are only compile tested.
Some Makefiles were changed to allow files to contain strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to use sysfs_emit() or seq_printf().
All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.)
drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-trans.c +4 -2
@@ -33,6 +33,7 @@ iwl_trans_get_restart_data(struct device *dev) {struct iwl_trans_dev_restart_data *tmp, *data =NULL ;const char *name =dev_name (dev); +size_t name_len;spin_lock (&restart_data_lock);list_for_each_entry (tmp, &restart_data_list, list) {
@@ -46,11 +47,12 @@ iwl_trans_get_restart_data(struct device *dev)if (data)return data; - data =kzalloc_flex (*data, name,strlen (name) +1 ,GFP_ATOMIC ); + name_len =strlen (name) +1 ; + data =kzalloc_flex (*data, name, name_len,GFP_ATOMIC );if (!data)return NULL ; -strcpy (data->name, name); +memcpy (data->name, name, name_len);spin_lock (&restart_data_lock);list_add_tail (&data->list, &restart_data_list);spin_unlock (&restart_data_lock);
Signature · 1 line
2.39.5