ath6kl: Use vmalloc to allocate ar->fw for api1 method
Subsystems (3)
PATCH v2 1/1 ath6kl: Use vmalloc to allocate ar->fw for api1 method
Since commit 8437754c8335 ("ath6kl: Use vmalloc instead of kmalloc for fw") ar->fw is expected to be pointing to memory allocated by vmalloc. If the api1 method (via ath6kl_fetch_fw_api1) is used to allocate memory for ar->fw, then kmemdup is used. This patch checks if the firmware being loaded is the 'fw' image, then use vmalloc, otherwise use kmalloc.
---
v2: Fix commit message and code formatting (use tab instaed of spaces)
drivers/net/wireless/ath/ath6kl/init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath6kl/init.c +6 -1
@@ -673,10 +673,15 @@ static int ath6kl_get_fw(struct ath6kl *ar, const char *filename,return ret; *fw_len = fw_entry->size; - *fw =kmemdup (fw_entry->data, fw_entry->size,GFP_KERNEL ); +if (&ar->fw == fw) + *fw =vmalloc (fw_entry->size); +else + *fw =kmalloc (fw_entry->size,GFP_KERNEL );if (*fw ==NULL ) ret = -ENOMEM ; +else +memcpy (*fw, fw_entry->data, fw_entry->size);release_firmware (fw_entry);
Signature · 6 lines
2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 24 lines · Brent Taylor
Since commit
8437754c8335("ath6kl: Use vmalloc instead of kmalloc for fw")ar->fwis expected to be pointing to memory allocated by vmalloc. If the api1 method (viaath6kl_fetch_fw_api1) is used to allocate memory forar->fw, then kmemdup is used. This patch checks if the firmware being loaded is the 'fw' image, then use vmalloc, otherwise use kmalloc.Signed-off-by Brent Taylor <[email protected]>---
v2: Fix commit message and code formatting (use tab instaed of spaces)drivers/net/wireless/ath/ath6kl/init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/net/wireless/ath/ath6kl/init.c +2
-1@@ -673,10 +673,15 @@ static int ath6kl_get_fw(struct ath6kl *ar, const char *filename,return ret; *fw_len = fw_entry->size; - *fw =kmemdup (fw_entry->data, fw_entry->size,GFP_KERNEL ); +if (&ar->fw == fw) + *fw =vmalloc (fw_entry->size);
drivers/net/wireless/ath/ath6kl/init.c static int ath6kl_get_fw(struct ath6kl *ar, const char *filename, · line 687
Quoted 10 lines
drivers/net/wireless/ath/ath6kl/init.c +4
-0+else + *fw =kmalloc (fw_entry->size,GFP_KERNEL );if (*fw ==NULL ) ret = -ENOMEM ; +else +memcpy (*fw, fw_entry->data, fw_entry->size);release_firmware (fw_entry);
This looks very odd.
Why not using kvfree() in ath6kl_core_cleanup() ?
If you switch to vmalloc() here because the kmemdup() was potentially failing, then the changelog should say it !
Using vmalloc() instead of kmalloc() should be driven by the allocation size, not the legacy code doing the freeing.