hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firmware_loader: Fix memory leak in firmware upload 

In the case of firmware-upload, an instance of struct fw_upload is
allocated in firmware_upload_register(). This data needs to be freed
in fw_dev_release(). Create a new fw_upload_free() function in
sysfs_upload.c to handle the firmware-upload specific memory frees
and incorporate the missing kfree call for the fw_upload structure.

Fixes: 97730bbb24 ("firmware_loader: Add firmware-upload support")
Cc: stable <stable@kernel.org>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
Link: https://lore.kernel.org/r/20220831002518.465274-1-russell.h.weight@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Russ Weight 2022-08-30 17:25:18 -07:00 committed by Greg Kroah-Hartman
parent 8b40c38e37
commit 789bba82f6
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/base/firmware_loader/sysfs.c
View File

@ -93,10 +93,9 @@ static void fw_dev_release(struct device *dev)
{ {
struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev);
if (fw_sysfs->fw_upload_priv) { if (fw_sysfs->fw_upload_priv)
free_fw_priv(fw_sysfs->fw_priv); fw_upload_free(fw_sysfs);
kfree(fw_sysfs->fw_upload_priv);
}
kfree(fw_sysfs); kfree(fw_sysfs);
} }

5
drivers/base/firmware_loader/sysfs.h
View File

@ -106,12 +106,17 @@ extern struct device_attribute dev_attr_cancel;
extern struct device_attribute dev_attr_remaining_size; extern struct device_attribute dev_attr_remaining_size;
int fw_upload_start(struct fw_sysfs *fw_sysfs); int fw_upload_start(struct fw_sysfs *fw_sysfs);
void fw_upload_free(struct fw_sysfs *fw_sysfs);
umode_t fw_upload_is_visible(struct kobject *kobj, struct attribute *attr, int n); umode_t fw_upload_is_visible(struct kobject *kobj, struct attribute *attr, int n);
#else #else
static inline int fw_upload_start(struct fw_sysfs *fw_sysfs) static inline int fw_upload_start(struct fw_sysfs *fw_sysfs)
{ {
return 0; return 0;
} }
static inline void fw_upload_free(struct fw_sysfs *fw_sysfs)
{
}
#endif #endif
#endif /* __FIRMWARE_SYSFS_H */ #endif /* __FIRMWARE_SYSFS_H */

9
drivers/base/firmware_loader/sysfs_upload.c
View File

@ -264,6 +264,15 @@ int fw_upload_start(struct fw_sysfs *fw_sysfs)
return 0; return 0;
} }
void fw_upload_free(struct fw_sysfs *fw_sysfs)
{
struct fw_upload_priv *fw_upload_priv = fw_sysfs->fw_upload_priv;
free_fw_priv(fw_sysfs->fw_priv);
kfree(fw_upload_priv->fw_upload);
kfree(fw_upload_priv);
}
/** /**
* firmware_upload_register() - register for the firmware upload sysfs API * firmware_upload_register() - register for the firmware upload sysfs API
* @module: kernel module of this device * @module: kernel module of this device