diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2017-05-03 15:26:00 +0100 |
|---|---|---|
| committer |   Kalle Valo <kvalo@qca.qualcomm.com> | 2017-05-19 10:51:57 +0300 |
| commit | 8fed6823e06e43ee9cf7c0ffecec2f9111ce6201 (patch) | |
| tree | 00651d1c25299ae80166b7e2d30614a43c53d659 /drivers/net/wireless/ath/ath5k/debug.c | |
| parent | ath9k: fix spelling in ath9k_tx99_init() (diff) | |
| download | linux-dev-8fed6823e06e43ee9cf7c0ffecec2f9111ce6201.tar.xz linux-dev-8fed6823e06e43ee9cf7c0ffecec2f9111ce6201.zip | |
ath5k: fix memory leak on buf on failed eeprom read
The AR5K_EEPROM_READ macro returns with -EIO if a read error
occurs causing a memory leak on the allocated buffer buf. Fix
this by explicitly calling ath5k_hw_nvram_read and exiting on
the via the freebuf label that performs the necessary free'ing
of buf when a read error occurs.
Detected by CoverityScan, CID#1248782 ("Resource Leak")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/debug.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c index d068df520e7a..bd7f6d7b199e 100644 --- a/drivers/net/wireless/ath/ath5k/debug.c +++ b/drivers/net/wireless/ath/ath5k/debug.c @@ -938,7 +938,10 @@ static int open_file_eeprom(struct inode *inode, struct file *file) } for (i = 0; i < eesize; ++i) { - AR5K_EEPROM_READ(i, val); + if (!ath5k_hw_nvram_read(ah, i, &val)) { + ret = -EIO; + goto freebuf; + } buf[i] = val; } |