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

   1 From patchwork Fri Aug 23 12:48:03 2019
   2 Content-Type: text/plain; charset="utf-8"
   3 MIME-Version: 1.0
   4 Content-Transfer-Encoding: 7bit
   5 X-Patchwork-Submitter: Stanislaw Gruszka <sgruszka@redhat.com>
   6 X-Patchwork-Id: 11111605
   7 X-Patchwork-Delegate: kvalo@adurom.com
   8 From: Stanislaw Gruszka <sgruszka@redhat.com>
   9 To: linux-wireless@vger.kernel.org
  10 Subject: [PATCH 5.3] rt2x00: clear up IV's on key removal
  11 Date: Fri, 23 Aug 2019 14:48:03 +0200
  12 Message-Id: <1566564483-31088-1-git-send-email-sgruszka@redhat.com>
  13 Sender: linux-wireless-owner@vger.kernel.org
  14 List-ID: <linux-wireless.vger.kernel.org>
  15 X-Mailing-List: linux-wireless@vger.kernel.org
  16
  17 After looking at code I realized that my previous fix
  18 95844124385e ("rt2x00: clear IV's on start to fix AP mode regression")
  19 was incomplete. We can still have wrong IV's after re-keyring.
  20 To fix that, clear up IV's also on key removal.
  21
  22 Fixes: 710e6cc1595e ("rt2800: do not nullify initialization vector data")
  23 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  24 ---
  25  drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 19 ++++++++++++-------
  26  1 file changed, 12 insertions(+), 7 deletions(-)
  27
  28 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  29 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  30 @@ -1654,13 +1654,18 @@ static void rt2800_config_wcid_attr_ciph
  31
  32         offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
  33
  34 -       rt2800_register_multiread(rt2x00dev, offset,
  35 -                                 &iveiv_entry, sizeof(iveiv_entry));
  36 -       if ((crypto->cipher == CIPHER_TKIP) ||
  37 -           (crypto->cipher == CIPHER_TKIP_NO_MIC) ||
  38 -           (crypto->cipher == CIPHER_AES))
  39 -               iveiv_entry.iv[3] |= 0x20;
  40 -       iveiv_entry.iv[3] |= key->keyidx << 6;
  41 +       if (crypto->cmd == SET_KEY) {
  42 +               rt2800_register_multiread(rt2x00dev, offset,
  43 +                                         &iveiv_entry, sizeof(iveiv_entry));
  44 +               if ((crypto->cipher == CIPHER_TKIP) ||
  45 +                   (crypto->cipher == CIPHER_TKIP_NO_MIC) ||
  46 +                   (crypto->cipher == CIPHER_AES))
  47 +                       iveiv_entry.iv[3] |= 0x20;
  48 +               iveiv_entry.iv[3] |= key->keyidx << 6;
  49 +       } else {
  50 +               memset(&iveiv_entry, 0, sizeof(iveiv_entry));
  51 +       }
  52 +
  53         rt2800_register_multiwrite(rt2x00dev, offset,
  54                                    &iveiv_entry, sizeof(iveiv_entry));
  55  }