Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

1 files changed, 5 insertions, 0 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 4453e2725e40..e458ca0dffec 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -283,6 +283,11 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         err = cfg80211_chandef_dfs_required(sdata->local->hw.wiphy,
                                             &chandef);
+        if (err < 0) {
+                sdata_info(sdata,
+                           "Failed to join IBSS, invalid chandef\n");
+                return;
+        }
         if (err > 0) {
                 if (!ifibss->userspace_handles_dfs) {
                         sdata_info(sdata,