Commit 1aa38ece authored by Manikanta Pubbisetty's avatar Manikanta Pubbisetty Committed by Greg Kroah-Hartman

{nl,mac}80211: fix interface combinations on crypto controlled devices

[ Upstream commit e6f40511 ]

Commit 33d915d9 ("{nl,mac}80211: allow 4addr AP operation on
crypto controlled devices") has introduced a change which allows
4addr operation on crypto controlled devices (ex: ath10k). This
change has inadvertently impacted the interface combinations logic
on such devices.

General rule is that software interfaces like AP/VLAN should not be
listed under supported interface combinations and should not be
considered during validation of these combinations; because of the
aforementioned change, AP/VLAN interfaces(if present) will be checked
against interfaces supported by the device and blocks valid interface
combinations.

Consider a case where an AP and AP/VLAN are up and running; when a
second AP device is brought up on the same physical device, this AP
will be checked against the AP/VLAN interface (which will not be
part of supported interface combinations of the device) and blocks
second AP to come up.

Add a new API cfg80211_iftype_allowed() to fix the problem, this
API works for all devices with/without SW crypto control.
Signed-off-by: default avatarManikanta Pubbisetty <mpubbise@codeaurora.org>
Fixes: 33d915d9 ("{nl,mac}80211: allow 4addr AP operation on crypto controlled devices")
Link: https://lore.kernel.org/r/1563779690-9716-1-git-send-email-mpubbise@codeaurora.orgSigned-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 178d1337
...@@ -6562,6 +6562,21 @@ int cfg80211_external_auth_request(struct net_device *netdev, ...@@ -6562,6 +6562,21 @@ int cfg80211_external_auth_request(struct net_device *netdev,
struct cfg80211_external_auth_params *params, struct cfg80211_external_auth_params *params,
gfp_t gfp); gfp_t gfp);
/**
* cfg80211_iftype_allowed - check whether the interface can be allowed
* @wiphy: the wiphy
* @iftype: interface type
* @is_4addr: use_4addr flag, must be '0' when check_swif is '1'
* @check_swif: check iftype against software interfaces
*
* Check whether the interface is allowed to operate; additionally, this API
* can be used to check iftype against the software interfaces when
* check_swif is '1'.
*/
bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype,
bool is_4addr, u8 check_swif);
/* Logging, debugging and troubleshooting/diagnostic helpers. */ /* Logging, debugging and troubleshooting/diagnostic helpers. */
/* wiphy_printk helpers, similar to dev_printk */ /* wiphy_printk helpers, similar to dev_printk */
......
...@@ -3527,9 +3527,7 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, ...@@ -3527,9 +3527,7 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,
} }
/* Always allow software iftypes */ /* Always allow software iftypes */
if (local->hw.wiphy->software_iftypes & BIT(iftype) || if (cfg80211_iftype_allowed(local->hw.wiphy, iftype, 0, 1)) {
(iftype == NL80211_IFTYPE_AP_VLAN &&
local->hw.wiphy->flags & WIPHY_FLAG_4ADDR_AP)) {
if (radar_detect) if (radar_detect)
return -EINVAL; return -EINVAL;
return 0; return 0;
...@@ -3564,7 +3562,8 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, ...@@ -3564,7 +3562,8 @@ int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,
if (sdata_iter == sdata || if (sdata_iter == sdata ||
!ieee80211_sdata_running(sdata_iter) || !ieee80211_sdata_running(sdata_iter) ||
local->hw.wiphy->software_iftypes & BIT(wdev_iter->iftype)) cfg80211_iftype_allowed(local->hw.wiphy,
wdev_iter->iftype, 0, 1))
continue; continue;
params.iftype_num[wdev_iter->iftype]++; params.iftype_num[wdev_iter->iftype]++;
......
...@@ -1335,10 +1335,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, ...@@ -1335,10 +1335,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
} }
break; break;
case NETDEV_PRE_UP: case NETDEV_PRE_UP:
if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)) && if (!cfg80211_iftype_allowed(wdev->wiphy, wdev->iftype,
!(wdev->iftype == NL80211_IFTYPE_AP_VLAN && wdev->use_4addr, 0))
rdev->wiphy.flags & WIPHY_FLAG_4ADDR_AP &&
wdev->use_4addr))
return notifier_from_errno(-EOPNOTSUPP); return notifier_from_errno(-EOPNOTSUPP);
if (rfkill_blocked(rdev->rfkill)) if (rfkill_blocked(rdev->rfkill))
......
...@@ -3210,9 +3210,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) ...@@ -3210,9 +3210,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
return err; return err;
} }
if (!(rdev->wiphy.interface_modes & (1 << type)) && if (!cfg80211_iftype_allowed(&rdev->wiphy, type, params.use_4addr, 0))
!(type == NL80211_IFTYPE_AP_VLAN && params.use_4addr &&
rdev->wiphy.flags & WIPHY_FLAG_4ADDR_AP))
return -EOPNOTSUPP; return -EOPNOTSUPP;
err = nl80211_parse_mon_options(rdev, type, info, &params); err = nl80211_parse_mon_options(rdev, type, info, &params);
......
...@@ -1670,7 +1670,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy, ...@@ -1670,7 +1670,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) {
num_interfaces += params->iftype_num[iftype]; num_interfaces += params->iftype_num[iftype];
if (params->iftype_num[iftype] > 0 && if (params->iftype_num[iftype] > 0 &&
!(wiphy->software_iftypes & BIT(iftype))) !cfg80211_iftype_allowed(wiphy, iftype, 0, 1))
used_iftypes |= BIT(iftype); used_iftypes |= BIT(iftype);
} }
...@@ -1692,7 +1692,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy, ...@@ -1692,7 +1692,7 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
return -ENOMEM; return -ENOMEM;
for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) {
if (wiphy->software_iftypes & BIT(iftype)) if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1))
continue; continue;
for (j = 0; j < c->n_limits; j++) { for (j = 0; j < c->n_limits; j++) {
all_iftypes |= limits[j].types; all_iftypes |= limits[j].types;
...@@ -1895,3 +1895,26 @@ EXPORT_SYMBOL(rfc1042_header); ...@@ -1895,3 +1895,26 @@ EXPORT_SYMBOL(rfc1042_header);
const unsigned char bridge_tunnel_header[] __aligned(2) = const unsigned char bridge_tunnel_header[] __aligned(2) =
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
EXPORT_SYMBOL(bridge_tunnel_header); EXPORT_SYMBOL(bridge_tunnel_header);
bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype,
bool is_4addr, u8 check_swif)
{
bool is_vlan = iftype == NL80211_IFTYPE_AP_VLAN;
switch (check_swif) {
case 0:
if (is_vlan && is_4addr)
return wiphy->flags & WIPHY_FLAG_4ADDR_AP;
return wiphy->interface_modes & BIT(iftype);
case 1:
if (!(wiphy->software_iftypes & BIT(iftype)) && is_vlan)
return wiphy->flags & WIPHY_FLAG_4ADDR_AP;
return wiphy->software_iftypes & BIT(iftype);
default:
break;
}
return false;
}
EXPORT_SYMBOL(cfg80211_iftype_allowed);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment