| Message ID | eae54ce066d541914f272b10cab7b263c08eced3.1729956868.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | [v2] wifi: cfg80211: Fix an error handling path in nl80211_start_ap() | expand |
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 1ac8a196f376..d9cc33474b85 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6273,8 +6273,10 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) } if (info->attrs[NL80211_ATTR_SMPS_MODE] && - nla_get_u8(info->attrs[NL80211_ATTR_SMPS_MODE]) != NL80211_SMPS_OFF) - return -EOPNOTSUPP; + nla_get_u8(info->attrs[NL80211_ATTR_SMPS_MODE]) != NL80211_SMPS_OFF) { + err = -EOPNOTSUPP; + goto out; + } params->pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]); if (params->pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ]) {
All error handling paths go to "out", except this one. Before the commit in Fixes, error in the previous code would also end to "out". So, go to "out" also in this case to free some resources before returning. Fixes: 62262dd00c31 ("wifi: cfg80211: disallow SMPS in AP mode") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Compile tested only Changes in v2: - Fix the subject v1: apparently never reached lore, certainly because of the duplicated subject with [1] [1]: https://lore.kernel.org/all/eca90eeb4d9e9a0545772b68aeaab883d9fe2279.1729952228.git.christophe.jaillet@wanadoo.fr/ --- net/wireless/nl80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)