| Message ID | 1471268785-11576-1-git-send-email-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
Colin King <colin.king@canonical.com> writes: > From: Colin Ian King <colin.king@canonical.com> > > caldata is not being free'd on the error exit path, causing > a memory leak. kfree it to fix the leak. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/net/wireless/ath/ath10k/pci.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c > index 9a22c47..886337c 100644 > --- a/drivers/net/wireless/ath/ath10k/pci.c > +++ b/drivers/net/wireless/ath/ath10k/pci.c > @@ -2725,6 +2725,7 @@ static int ath10k_pci_hif_fetch_cal_eeprom(struct ath10k *ar, void **data, > return 0; > > err_free: > + kfree(caldata); > kfree(data); > > return -EINVAL; I don't think we should free data at all: static int ath10k_download_cal_eeprom(struct ath10k *ar) { size_t data_len; void *data = NULL; int ret; ret = ath10k_hif_fetch_cal_eeprom(ar, &data, &data_len); Instead we should free only caldata, right?
On 02/09/16 16:45, Valo, Kalle wrote: > Colin King <colin.king@canonical.com> writes: > >> From: Colin Ian King <colin.king@canonical.com> >> >> caldata is not being free'd on the error exit path, causing >> a memory leak. kfree it to fix the leak. >> >> Signed-off-by: Colin Ian King <colin.king@canonical.com> >> --- >> drivers/net/wireless/ath/ath10k/pci.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c >> index 9a22c47..886337c 100644 >> --- a/drivers/net/wireless/ath/ath10k/pci.c >> +++ b/drivers/net/wireless/ath/ath10k/pci.c >> @@ -2725,6 +2725,7 @@ static int ath10k_pci_hif_fetch_cal_eeprom(struct ath10k *ar, void **data, >> return 0; >> >> err_free: >> + kfree(caldata); >> kfree(data); >> >> return -EINVAL; > > I don't think we should free data at all: > > static int ath10k_download_cal_eeprom(struct ath10k *ar) > { > size_t data_len; > void *data = NULL; > int ret; > > ret = ath10k_hif_fetch_cal_eeprom(ar, &data, &data_len); > > Instead we should free only caldata, right? > Yep, good catch, I'll send V2 later. Colin
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 9a22c47..886337c 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -2725,6 +2725,7 @@ static int ath10k_pci_hif_fetch_cal_eeprom(struct ath10k *ar, void **data, return 0; err_free: + kfree(caldata); kfree(data); return -EINVAL;