Hi Stanislaw, On Fri, Mar 18, 2016 at 9:48 PM, Stanislaw Gruszka <[email protected]> wrote: > On Fri, Mar 18, 2016 at 01:28:33PM +1100, Julian Calaby wrote: >> From: Jia-Ju Bai <[email protected]> >> >> When il4965_hw_nic_init in __il4965_up fails, the memory allocated by >> iwl4965_sta_alloc_lq in iwl4965_alloc_bcast_station is not freed. >> >> This patches adds il_dealloc_bcast_stations in the error handling code of >> __il4965_up to fix this problem. >> >> This patch has been tested in real device, and it actually fixes the bug. > > Could the call trace from the bug be provided ? > >> Signed-off-by: Jia-Ju Bai <[email protected]> >> Acked-by: Stanislaw Gruszka <[email protected]> >> Signed-off-by: Julian Calaby <[email protected]> >> --- >> drivers/net/wireless/intel/iwlegacy/4965-mac.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c >> b/drivers/net/wireless/intel/iwlegacy/4965-mac.c >> index b75f4ef..30d9dd3 100644 >> --- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c >> +++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c >> @@ -5577,6 +5577,7 @@ __il4965_up(struct il_priv *il) >> ret = il4965_hw_nic_init(il); >> if (ret) { >> IL_ERR("Unable to init nic\n"); >> + il_dealloc_bcast_stations(il); > > I missed that before, but now this look suspicious for me. > > il_dealloc_bcast_stations() do: > > il->num_stations--; > BUG_ON(il->num_stations < 0); > > But on il4965_alloc_bcast_station() we do not increase il->num_stations > Hence either this BUG_ON should be removed or il->num_stations should be > increased during allocation.
I don't think you're right. Looking closely at the code, il->num_stations gets incremented in il_prep_station() which is called unconditionally from il4965_alloc_bcast_station(). So I think this and the following patch are fine. Thanks, -- Julian Calaby Email: [email protected] Profile: http://www.google.com/profiles/julian.calaby/ -- 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
