]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
cfg80211: really ignore the regulatory request
authorSven Neumann <s.neumann@raumfeld.com>
Tue, 12 Jul 2011 13:52:07 +0000 (15:52 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jul 2011 20:27:29 +0000 (16:27 -0400)
commita203c2aa4cefccb879c879b8e1cad1a09a679e55
treed57316d29df82b4ae2bf1ea15128bcbea7335d66
parent276556dbd2d9f56f8933393f927e88fae142ce8f
cfg80211: really ignore the regulatory request

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@raumfeld.com>
Cc: linux-wireless@vger.kernel.org
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Daniel Mack <daniel@zonque.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/wireless/reg.c