1 files changed, 6 insertions, 1 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index ea4c299fbe3b..5e14371cda70 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2129,7 +2129,12 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
                  * driver wanted to the wiphy to deal with conflicts
                  */
 
-                BUG_ON(request_wiphy->regd);
+                /*
+                 * Userspace could have sent two replies with only
+                 * one kernel request.
+                 */
+                if (request_wiphy->regd)
+                        return -EALREADY;
 
                 r = reg_copy_regd(&request_wiphy->regd, rd);
                 if (r)