[PATCH] cfg80211: really ignore the regulatory request

[Sven Neumann]

Hi,

this patches fixes a kernel crash. Perhaps I should file a bug report on
the kernel bug-tracker so that it gets more attention?

On Fri, 2011-07-15 at 13:33 -0400, John W. Linville wrote:
> Luis, ping?
> 
> On Tue, Jul 12, 2011 at 03:52:07PM +0200, Sven Neumann wrote:
> > At the beginning of wiphy_update_regulatory() a check is performed
> > whether the request is to be ignored. Then the request is sent to
> > the driver nevertheless. This happens even if last_request points
> > to NULL, leading to a crash in the driver:
> > 
> >  [<bf01d864>] (lbs_set_11d_domain_info+0x28/0x1e4 [libertas]) from [<c03b714c>] (wiphy_update_regulatory+0x4d0/0x4f4)
> >  [<c03b714c>] (wiphy_update_regulatory+0x4d0/0x4f4) from [<c03b4008>] (wiphy_register+0x354/0x420)
> >  [<c03b4008>] (wiphy_register+0x354/0x420) from [<bf01b17c>] (lbs_cfg_register+0x80/0x164 [libertas])
> >  [<bf01b17c>] (lbs_cfg_register+0x80/0x164 [libertas]) from [<bf020e64>] (lbs_start_card+0x20/0x88 [libertas])
> >  [<bf020e64>] (lbs_start_card+0x20/0x88 [libertas]) from [<bf02cbd8>] (if_sdio_probe+0x898/0x9c0 [libertas_sdio])
> > 
> > Fix this by returning early. Also remove the out: label as it is
> > not any longer needed.
> > 
> > Signed-off-by: Sven Neumann <s.neumann at raumfeld.com>
> > Cc: linux-wireless at vger.kernel.org
> > Cc: Johannes Berg <johannes at sipsolutions.net>
> > Cc: Daniel Mack <daniel at zonque.org>
> > ---
> >  net/wireless/reg.c |    5 +++--
> >  1 files changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> > index 1ad0f39..4453eb7 100644
> > --- a/net/wireless/reg.c
> > +++ b/net/wireless/reg.c
> > @@ -1125,12 +1125,13 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
> >  	enum ieee80211_band band;
> >  
> >  	if (ignore_reg_update(wiphy, initiator))
> > -		goto out;
> > +		return;
> > +
> >  	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
> >  		if (wiphy->bands[band])
> >  			handle_band(wiphy, band, initiator);
> >  	}
> > -out:
> > +
> >  	reg_process_beacons(wiphy);
> >  	reg_process_ht_flags(wiphy);
> >  	if (wiphy->reg_notifier)
> > -- 
> > 1.7.1
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> > the body of a message to majordomo at vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
>