2018-09-23 16:02:35 +00:00
|
|
|
--- a/include/net/cfg80211.h
|
|
|
|
+++ b/include/net/cfg80211.h
|
2021-05-26 18:00:14 +00:00
|
|
|
@@ -3745,6 +3745,7 @@ struct mgmt_frame_regs {
|
2013-11-12 22:11:33 +00:00
|
|
|
* (as advertised by the nl80211 feature flag.)
|
|
|
|
* @get_tx_power: store the current TX power into the dbm variable;
|
|
|
|
* return 0 if successful
|
|
|
|
+ * @set_antenna_gain: set antenna gain to reduce maximum tx power if necessary
|
|
|
|
*
|
|
|
|
* @set_wds_peer: set the WDS peer for a WDS interface
|
|
|
|
*
|
2021-05-26 18:00:14 +00:00
|
|
|
@@ -4067,6 +4068,7 @@ struct cfg80211_ops {
|
2013-11-12 22:11:33 +00:00
|
|
|
enum nl80211_tx_power_setting type, int mbm);
|
|
|
|
int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
|
|
|
|
int *dbm);
|
|
|
|
+ int (*set_antenna_gain)(struct wiphy *wiphy, int dbi);
|
|
|
|
|
|
|
|
int (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
|
|
|
|
const u8 *addr);
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/include/net/mac80211.h
|
|
|
|
+++ b/include/net/mac80211.h
|
2020-12-17 21:22:22 +00:00
|
|
|
@@ -1561,6 +1561,7 @@ enum ieee80211_smps_mode {
|
2012-09-28 18:29:09 +00:00
|
|
|
*
|
2012-12-07 16:46:04 +00:00
|
|
|
* @power_level: requested transmit power (in dBm), backward compatibility
|
|
|
|
* value only that is set to the minimum of all interfaces
|
2012-09-28 18:29:09 +00:00
|
|
|
+ * @max_antenna_gain: maximum antenna gain adjusted by user config (in dBi)
|
|
|
|
*
|
2013-04-26 10:52:03 +00:00
|
|
|
* @chandef: the channel definition to tune to
|
|
|
|
* @radar_enabled: whether radar detection is enabled
|
2020-12-17 21:22:22 +00:00
|
|
|
@@ -1581,6 +1582,7 @@ enum ieee80211_smps_mode {
|
2015-10-30 15:17:56 +00:00
|
|
|
struct ieee80211_conf {
|
2012-09-28 18:29:09 +00:00
|
|
|
u32 flags;
|
|
|
|
int power_level, dynamic_ps_timeout;
|
|
|
|
+ int max_antenna_gain;
|
|
|
|
|
|
|
|
u16 listen_interval;
|
|
|
|
u8 ps_dtim_period;
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/include/uapi/linux/nl80211.h
|
|
|
|
+++ b/include/uapi/linux/nl80211.h
|
2021-05-26 18:00:14 +00:00
|
|
|
@@ -2560,6 +2560,9 @@ enum nl80211_commands {
|
2021-03-14 23:05:42 +00:00
|
|
|
* disassoc events to indicate that an immediate reconnect to the AP
|
|
|
|
* is desired.
|
2013-09-08 09:38:38 +00:00
|
|
|
*
|
|
|
|
+ * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
|
2013-11-12 22:11:33 +00:00
|
|
|
+ * transmit power to stay within regulatory limits. u32, dBi.
|
2013-09-08 09:38:38 +00:00
|
|
|
+ *
|
2015-03-11 15:02:47 +00:00
|
|
|
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
|
2013-09-08 09:38:38 +00:00
|
|
|
* @NL80211_ATTR_MAX: highest attribute number currently defined
|
|
|
|
* @__NL80211_ATTR_AFTER_LAST: internal use
|
2021-05-26 18:00:14 +00:00
|
|
|
@@ -3057,6 +3060,8 @@ enum nl80211_attrs {
|
2021-03-14 23:05:42 +00:00
|
|
|
|
2021-05-26 18:00:14 +00:00
|
|
|
NL80211_ATTR_DISABLE_HE,
|
2012-09-28 18:29:09 +00:00
|
|
|
|
|
|
|
+ NL80211_ATTR_WIPHY_ANTENNA_GAIN,
|
|
|
|
+
|
|
|
|
/* add attributes here, update the policy in nl80211.c */
|
|
|
|
|
|
|
|
__NL80211_ATTR_AFTER_LAST,
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/mac80211/cfg.c
|
|
|
|
+++ b/net/mac80211/cfg.c
|
2021-05-02 16:45:40 +00:00
|
|
|
@@ -2709,6 +2709,19 @@ static int ieee80211_get_tx_power(struct
|
2012-09-28 18:29:09 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
+static int ieee80211_set_antenna_gain(struct wiphy *wiphy, int dbi)
|
|
|
|
+{
|
|
|
|
+ struct ieee80211_local *local = wiphy_priv(wiphy);
|
|
|
|
+
|
|
|
|
+ if (dbi < 0)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
|
|
+ local->user_antenna_gain = dbi;
|
|
|
|
+ ieee80211_hw_config(local, 0);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
|
|
|
|
const u8 *addr)
|
|
|
|
{
|
2021-05-02 16:45:40 +00:00
|
|
|
@@ -4139,6 +4152,7 @@ const struct cfg80211_ops mac80211_confi
|
2012-09-28 18:29:09 +00:00
|
|
|
.set_wiphy_params = ieee80211_set_wiphy_params,
|
|
|
|
.set_tx_power = ieee80211_set_tx_power,
|
|
|
|
.get_tx_power = ieee80211_get_tx_power,
|
|
|
|
+ .set_antenna_gain = ieee80211_set_antenna_gain,
|
|
|
|
.set_wds_peer = ieee80211_set_wds_peer,
|
|
|
|
.rfkill_poll = ieee80211_rfkill_poll,
|
|
|
|
CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/mac80211/ieee80211_i.h
|
|
|
|
+++ b/net/mac80211/ieee80211_i.h
|
mac80211: backport upstream fixes for FragAttacks
From the patch series description:
Several security issues in the 802.11 implementations were found by
Mathy Vanhoef (New York University Abu Dhabi), who has published all
the details at
https://papers.mathyvanhoef.com/usenix2021.pdf
Specifically, the following CVEs were assigned:
* CVE-2020-24586 - Fragmentation cache not cleared on reconnection
* CVE-2020-24587 - Reassembling fragments encrypted under different
keys
* CVE-2020-24588 - Accepting non-SPP A-MSDU frames, which leads to
payload being parsed as an L2 frame under an
A-MSDU bit toggling attack
* CVE-2020-26139 - Forwarding EAPOL from unauthenticated sender
* CVE-2020-26140 - Accepting plaintext data frames in protected
networks
* CVE-2020-26141 - Not verifying TKIP MIC of fragmented frames
* CVE-2020-26142 - Processing fragmented frames as full frames
* CVE-2020-26143 - Accepting fragmented plaintext frames in
protected networks
* CVE-2020-26144 - Always accepting unencrypted A-MSDU frames that
start with RFC1042 header with EAPOL ethertype
* CVE-2020-26145 - Accepting plaintext broadcast fragments as full
frames
* CVE-2020-26146 - Reassembling encrypted fragments with non-consecutive
packet numbers
* CVE-2020-26147 - Reassembling mixed encrypted/plaintext fragments
In general, the scope of these attacks is that they may allow an
attacker to
* inject L2 frames that they can more or less control (depending on the
vulnerability and attack method) into an otherwise protected network;
* exfiltrate (some) network data under certain conditions, this is
specific to the fragmentation issues.
A subset of these issues is known to apply to the Linux IEEE 802.11
implementation (mac80211). Where it is affected, the attached patches
fix the issues, even if not all of them reference the exact CVE IDs.
In addition, driver and/or firmware updates may be necessary, as well
as potentially more fixes to mac80211, depending on how drivers are
using it.
Specifically, for Intel devices, firmware needs to be updated to the
most recently released versions (which was done without any reference
to the security issues) to address some of the vulnerabilities.
To have a single set of patches, I'm also including patches for the
ath10k and ath11k drivers here.
We currently don't have information about how other drivers are, if
at all, affected.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2021-05-12 12:28:37 +00:00
|
|
|
@@ -1390,6 +1390,7 @@ struct ieee80211_local {
|
2013-11-12 22:11:33 +00:00
|
|
|
int dynamic_ps_forced_timeout;
|
|
|
|
|
|
|
|
int user_power_level; /* in dBm, for all interfaces */
|
|
|
|
+ int user_antenna_gain; /* in dBi */
|
|
|
|
|
|
|
|
enum ieee80211_smps_mode smps_mode;
|
2012-09-28 18:29:09 +00:00
|
|
|
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/mac80211/main.c
|
|
|
|
+++ b/net/mac80211/main.c
|
2020-06-20 21:11:17 +00:00
|
|
|
@@ -96,7 +96,7 @@ static u32 ieee80211_hw_conf_chan(struct
|
2013-11-12 22:11:33 +00:00
|
|
|
struct ieee80211_sub_if_data *sdata;
|
2013-04-26 10:52:03 +00:00
|
|
|
struct cfg80211_chan_def chandef = {};
|
2012-12-07 16:46:04 +00:00
|
|
|
u32 changed = 0;
|
2013-11-12 22:11:33 +00:00
|
|
|
- int power;
|
2014-04-08 22:11:23 +00:00
|
|
|
+ int power, max_power;
|
2012-12-07 16:46:04 +00:00
|
|
|
u32 offchannel_flag;
|
2013-04-26 10:52:03 +00:00
|
|
|
|
|
|
|
offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
|
2020-06-20 21:11:17 +00:00
|
|
|
@@ -157,6 +157,12 @@ static u32 ieee80211_hw_conf_chan(struct
|
2013-11-12 22:11:33 +00:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2012-12-07 16:46:04 +00:00
|
|
|
|
2013-04-26 10:52:03 +00:00
|
|
|
+ max_power = chandef.chan->max_reg_power;
|
2012-12-07 16:46:04 +00:00
|
|
|
+ if (local->user_antenna_gain > 0) {
|
2014-04-08 22:11:23 +00:00
|
|
|
+ max_power -= local->user_antenna_gain;
|
2012-12-10 13:51:09 +00:00
|
|
|
+ power = min(power, max_power);
|
2012-12-07 16:46:04 +00:00
|
|
|
+ }
|
|
|
|
+
|
2014-04-08 22:11:23 +00:00
|
|
|
if (local->hw.conf.power_level != power) {
|
2012-12-07 16:46:04 +00:00
|
|
|
changed |= IEEE80211_CONF_CHANGE_POWER;
|
2014-10-22 16:26:56 +00:00
|
|
|
local->hw.conf.power_level = power;
|
2020-06-20 21:11:17 +00:00
|
|
|
@@ -665,6 +671,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
|
2012-12-07 16:46:04 +00:00
|
|
|
IEEE80211_RADIOTAP_MCS_HAVE_BW;
|
|
|
|
local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
|
|
|
|
IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
|
|
|
|
+ local->user_antenna_gain = 0;
|
2013-04-26 10:52:03 +00:00
|
|
|
local->hw.uapsd_queues = IEEE80211_DEFAULT_UAPSD_QUEUES;
|
|
|
|
local->hw.uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN;
|
2019-10-01 21:28:36 +00:00
|
|
|
local->hw.max_mtu = IEEE80211_MAX_DATA_LEN;
|
2018-09-23 16:02:35 +00:00
|
|
|
--- a/net/wireless/nl80211.c
|
|
|
|
+++ b/net/wireless/nl80211.c
|
2021-05-26 18:00:14 +00:00
|
|
|
@@ -740,6 +740,7 @@ static const struct nla_policy nl80211_p
|
|
|
|
NLA_POLICY_RANGE(NLA_U8, NL80211_SAE_PWE_HUNT_AND_PECK,
|
|
|
|
NL80211_SAE_PWE_BOTH),
|
2021-03-14 23:05:42 +00:00
|
|
|
[NL80211_ATTR_RECONNECT_REQUESTED] = { .type = NLA_REJECT },
|
2013-11-12 22:11:33 +00:00
|
|
|
+ [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* policy for the key attributes */
|
2021-05-26 18:00:14 +00:00
|
|
|
@@ -3248,6 +3249,20 @@ static int nl80211_set_wiphy(struct sk_b
|
2015-05-21 19:32:16 +00:00
|
|
|
if (result)
|
2014-04-06 10:41:23 +00:00
|
|
|
return result;
|
2013-11-12 22:11:33 +00:00
|
|
|
}
|
2015-05-21 19:32:16 +00:00
|
|
|
+
|
2013-11-12 22:11:33 +00:00
|
|
|
+ if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_GAIN]) {
|
|
|
|
+ int idx, dbi = 0;
|
|
|
|
+
|
2014-04-06 10:41:23 +00:00
|
|
|
+ if (!rdev->ops->set_antenna_gain)
|
|
|
|
+ return -EOPNOTSUPP;
|
2013-11-12 22:11:33 +00:00
|
|
|
+
|
|
|
|
+ idx = NL80211_ATTR_WIPHY_ANTENNA_GAIN;
|
|
|
|
+ dbi = nla_get_u32(info->attrs[idx]);
|
|
|
|
+
|
|
|
|
+ result = rdev->ops->set_antenna_gain(&rdev->wiphy, dbi);
|
|
|
|
+ if (result)
|
2014-04-06 10:41:23 +00:00
|
|
|
+ return result;
|
2013-11-12 22:11:33 +00:00
|
|
|
+ }
|
2015-05-21 19:32:16 +00:00
|
|
|
|
2013-11-12 22:11:33 +00:00
|
|
|
if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
|
|
|
|
info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
|