mac80211: rt2x00: import pending patches

[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / rt2x00 / 011-rt2x00-clear-up-IV-s-on-key-removal.patch

diff --git a/package/kernel/mac80211/patches/rt2x00/011-rt2x00-clear-up-IV-s-on-key-removal.patch b/package/kernel/mac80211/patches/rt2x00/011-rt2x00-clear-up-IV-s-on-key-removal.patch
new file mode 100644 (file)
index 0000000..06430b0
--- /dev/null
+++ b/package/kernel/mac80211/patches/rt2x00/011-rt2x00-clear-up-IV-s-on-key-removal.patch
@@ -0,0 +1,57 @@
+From patchwork Fri Aug 23 12:48:03 2019
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Stanislaw Gruszka <sgruszka@redhat.com>
+X-Patchwork-Id: 11111605
+X-Patchwork-Delegate: kvalo@adurom.com
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+To: linux-wireless@vger.kernel.org
+Subject: [PATCH 5.3] rt2x00: clear up IV's on key removal
+Date: Fri, 23 Aug 2019 14:48:03 +0200
+Message-Id: <1566564483-31088-1-git-send-email-sgruszka@redhat.com>
+Sender: linux-wireless-owner@vger.kernel.org
+List-ID: <linux-wireless.vger.kernel.org>
+X-Mailing-List: linux-wireless@vger.kernel.org
+
+After looking at code I realized that my previous fix
+95844124385e ("rt2x00: clear IV's on start to fix AP mode regression")
+was incomplete. We can still have wrong IV's after re-keyring.
+To fix that, clear up IV's also on key removal.
+
+Fixes: 710e6cc1595e ("rt2800: do not nullify initialization vector data")
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+---
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+index ecbe78b8027b..28e2de04834e 100644
+--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+@@ -1654,13 +1654,18 @@ static void rt2800_config_wcid_attr_cipher(struct rt2x00_dev *rt2x00dev,
+ 
+       offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
+ 
+-      rt2800_register_multiread(rt2x00dev, offset,
+-                                &iveiv_entry, sizeof(iveiv_entry));
+-      if ((crypto->cipher == CIPHER_TKIP) ||
+-          (crypto->cipher == CIPHER_TKIP_NO_MIC) ||
+-          (crypto->cipher == CIPHER_AES))
+-              iveiv_entry.iv[3] |= 0x20;
+-      iveiv_entry.iv[3] |= key->keyidx << 6;
++      if (crypto->cmd == SET_KEY) {
++              rt2800_register_multiread(rt2x00dev, offset,
++                                        &iveiv_entry, sizeof(iveiv_entry));
++              if ((crypto->cipher == CIPHER_TKIP) ||
++                  (crypto->cipher == CIPHER_TKIP_NO_MIC) ||
++                  (crypto->cipher == CIPHER_AES))
++                      iveiv_entry.iv[3] |= 0x20;
++              iveiv_entry.iv[3] |= key->keyidx << 6;
++      } else {
++              memset(&iveiv_entry, 0, sizeof(iveiv_entry));
++      }
++
+       rt2800_register_multiwrite(rt2x00dev, offset,
+                                  &iveiv_entry, sizeof(iveiv_entry));
+ }