Skip to contentSkip to conversation

ath5k: fix memory leak when fewer than N_PD_CURVES are in use

PATCH New Bob Copeland 1 participant 1 message Jun 29, 2011 Atheros ATH5K wireless driver

lore
Share & tools
lore

Bob Copeland

author
#0 lore raw

PATCH 1/1 ath5k: fix memory leak when fewer than N_PD_CURVES are in use

From: Eugene A. Shatokhin <[email protected]>

We would free the proper number of curves, but in the wrong slots, due to a missing level of indirection through the pdgain_idx table.

It's simpler just to try to free all four slots, so do that.

Cc [email protected]
Signed-off-by Bob Copeland <[email protected]>
---
 drivers/net/wireless/ath/ath5k/eeprom.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath5k/eeprom.c +3 -5
index 1fef84f..392771f 100644
@@ -691,14 +691,12 @@ ath5k_eeprom_free_pcal_info(struct ath5k_hw *ah, int mode)
 		if (!chinfo[pier].pd_curves)
 			continue;
 
-		for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) {
+		for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) {
 			struct ath5k_pdgain_info *pd =
 					&chinfo[pier].pd_curves[pdg];
 
-			if (pd != NULL) {
-				kfree(pd->pd_step);
-				kfree(pd->pd_pwr);
-			}
+			kfree(pd->pd_step);
+			kfree(pd->pd_pwr);
 		}
 
 		kfree(chinfo[pier].pd_curves);
Signature · 4 lines
1.7.2.5

-- 
Bob Copeland %% www.bobcopeland.com