]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - net/wireless/reg.c
regulatory: fix restore_regulatory_settings
authorJohannes Berg <johannes.berg@intel.com>
Wed, 9 Jan 2013 11:01:38 +0000 (12:01 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 9 Jan 2013 11:19:52 +0000 (12:19 +0100)
commit2d31986764926630a6df72123a5e217219b32594
treec363b7d854e00b9791f8750100646d66301da832
parent4a484cffc5e1836114e9556f7c704412d491200c
regulatory: fix restore_regulatory_settings

My commit 379b82f4c9dc6e67bf61aa61b096c06a2f320f60
("regulatory: pass new regdomain to reset function")
broke the restore_regulatory_settings() function due
to a logic change. Consider this change:

- reset_regdomains(true);
- cfg80211_regdomain = cfg80211_world_regdom;
+ reset_regdomains(true, cfg80211_world_regdom);

This looks innocent enough, until you realise that the
called function (reset_regdomains) also resets the
cfg80211_world_regdom pointer, so that the old version
of the code would use the new object it pointed to and
the new version of the code uses the old object. This
lead to a double-free of this object.

Since reset_regdomains() sets it to &world_regdom, use
that directly.

Reported-by: Sujith Manoharan <sujith@msujith.org>
Tested-by: Sujith Manoharan <sujith@msujith.org>
Reported-by: Bob Copeland <me@bobcopeland.com>
Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/reg.c