]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mac80211: remove BUG() when interface type is invalid
authorLuca Coelho <luciano.coelho@intel.com>
Sun, 29 Oct 2017 09:51:10 +0000 (11:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Mar 2018 08:09:59 +0000 (09:09 +0100)
[ Upstream commit c7976f5272486e4ff406014c4b43e2fa3b70b052 ]

In the ieee80211_setup_sdata() we check if the interface type is valid
and, if not, call BUG().  This should never happen, but if there is
something wrong with the code, it will not be caught until the bug
happens when an interface is being set up.  Calling BUG() is too
extreme for this and a WARN_ON() would be better used instead.  Change
that.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mac80211/iface.c

index 13b16f90e1cf4efcd3dab8366a553cdd1b6598bd..0fa844293710d68144cdf2a9698da0df90d00dae 100644 (file)
@@ -1474,7 +1474,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
                break;
        case NL80211_IFTYPE_UNSPECIFIED:
        case NUM_NL80211_IFTYPES:
-               BUG();
+               WARN_ON(1);
                break;
        }