package/kernel/mac80211/patches/rt2x00/073-rt2x00-clear-up-IV-s-on-key-removal.patch

   1 From 14d5e14c8a6c257eb322ddeb294ac4c243a7d2e1 Mon Sep 17 00:00:00 2001
   2 From: Stanislaw Gruszka <sgruszka@redhat.com>
   3 Date: Fri, 23 Aug 2019 14:48:03 +0200
   4 Subject: [PATCH 14/15] rt2x00: clear up IV's on key removal
   5
   6 After looking at code I realized that my previous fix
   7 95844124385e ("rt2x00: clear IV's on start to fix AP mode regression")
   8 was incomplete. We can still have wrong IV's after re-keyring.
   9 To fix that, clear up IV's also on key removal.
  10
  11 Fixes: 710e6cc1595e ("rt2800: do not nullify initialization vector data")
  12 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  13 tested-by: Emil Karlson <jekarl@iki.fi>
  14 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  15 ---
  16  .../net/wireless/ralink/rt2x00/rt2800lib.c    | 19 ++++++++++++-------
  17  1 file changed, 12 insertions(+), 7 deletions(-)
  18
  19 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  20 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  21 @@ -1665,13 +1665,18 @@ static void rt2800_config_wcid_attr_ciph
  22
  23         offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
  24
  25 -       rt2800_register_multiread(rt2x00dev, offset,
  26 -                                 &iveiv_entry, sizeof(iveiv_entry));
  27 -       if ((crypto->cipher == CIPHER_TKIP) ||
  28 -           (crypto->cipher == CIPHER_TKIP_NO_MIC) ||
  29 -           (crypto->cipher == CIPHER_AES))
  30 -               iveiv_entry.iv[3] |= 0x20;
  31 -       iveiv_entry.iv[3] |= key->keyidx << 6;
  32 +       if (crypto->cmd == SET_KEY) {
  33 +               rt2800_register_multiread(rt2x00dev, offset,
  34 +                                         &iveiv_entry, sizeof(iveiv_entry));
  35 +               if ((crypto->cipher == CIPHER_TKIP) ||
  36 +                   (crypto->cipher == CIPHER_TKIP_NO_MIC) ||
  37 +                   (crypto->cipher == CIPHER_AES))
  38 +                       iveiv_entry.iv[3] |= 0x20;
  39 +               iveiv_entry.iv[3] |= key->keyidx << 6;
  40 +       } else {
  41 +               memset(&iveiv_entry, 0, sizeof(iveiv_entry));
  42 +       }
  43 +
  44         rt2800_register_multiwrite(rt2x00dev, offset,
  45                                    &iveiv_entry, sizeof(iveiv_entry));
  46  }