mac80211: fix memory overlap due to variable length param

As of now HE operation element in bss_conf includes variable length
optional field followed by other HE variable. Though the optional
field never be used, actually it is referring to next member of the
bss_conf structure which is not correct. Fix it by declaring needed
HE operation fields within bss_conf itself.

Signed-off-by: Rajkumar Manoharan <rmanohar@codeaurora.org>
Link: https://lore.kernel.org/r/1587768108-25248-2-git-send-email-rmanohar@codeaurora.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 9f8bc19cc5ae11f7c851ce2cca2996229012a9ae..06d063274eeadcfa305205e7c143f8ecf3841274 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -1168,8 +1168,7 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar,
               sizeof(arg->peer_he_cap_macinfo));
        memcpy(&arg->peer_he_cap_phyinfo, he_cap->he_cap_elem.phy_cap_info,
               sizeof(arg->peer_he_cap_phyinfo));
-       memcpy(&arg->peer_he_ops, &vif->bss_conf.he_operation,
-              sizeof(arg->peer_he_ops));
+       arg->peer_he_ops = vif->bss_conf.he_oper.params;
 
        /* the top most byte is used to indicate BSS color info */
        arg->peer_he_ops &= 0xffffff;

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index ecb219e3ec4f97e672479f944472e4999ef61b2a..78f7ce586287102ee1d0287de0e932abdaae6471 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -604,7 +604,7 @@ struct ieee80211_ftm_responder_params {
  *     nontransmitted BSSIDs
  * @profile_periodicity: the least number of beacon frames need to be received
  *     in order to discover all the nontransmitted BSSIDs in the set.
- * @he_operation: HE operation information of the AP we are connected to
+ * @he_oper: HE operation information of the AP we are connected to
  * @he_obss_pd: OBSS Packet Detection parameters.
  * @he_bss_color: BSS coloring settings, if BSS supports HE
  */
@@ -668,7 +668,10 @@ struct ieee80211_bss_conf {
        u8 bssid_indicator;
        bool ema_ap;
        u8 profile_periodicity;
-       struct ieee80211_he_operation he_operation;
+       struct {
+               u32 params;
+               u16 nss_set;
+       } he_oper;
        struct ieee80211_he_obss_pd he_obss_pd;
        struct cfg80211_he_bss_color he_bss_color;
 };

diff --git a/net/mac80211/he.c b/net/mac80211/he.c
index 1087f715338b5626e81e15bd3c1bfc83bbff5b4a..f520552b22bea2a96f5e2196a7344fedbbdb5901 100644 (file)
--- a/net/mac80211/he.c
+++ b/net/mac80211/he.c
@@ -57,17 +57,14 @@ ieee80211_he_cap_ie_to_sta_he_cap(struct ieee80211_sub_if_data *sdata,
 
 void
 ieee80211_he_op_ie_to_bss_conf(struct ieee80211_vif *vif,
-                       const struct ieee80211_he_operation *he_op_ie_elem)
+                       const struct ieee80211_he_operation *he_op_ie)
 {
-       struct ieee80211_he_operation *he_operation =
-                                       &vif->bss_conf.he_operation;
-
-       if (!he_op_ie_elem) {
-               memset(he_operation, 0, sizeof(*he_operation));
+       memset(&vif->bss_conf.he_oper, 0, sizeof(vif->bss_conf.he_oper));
+       if (!he_op_ie)
                return;
-       }
 
-       vif->bss_conf.he_operation = *he_op_ie_elem;
+       vif->bss_conf.he_oper.params = __le32_to_cpu(he_op_ie->he_oper_params);
+       vif->bss_conf.he_oper.nss_set = __le16_to_cpu(he_op_ie->he_mcs_nss_set);
 }
 
 void