From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0DE0C3A5A3 for ; Tue, 27 Aug 2019 08:30:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56F3E2053B for ; Tue, 27 Aug 2019 08:30:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kapsi.fi header.i=@kapsi.fi header.b="kHnPKJyL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728976AbfH0Iao (ORCPT ); Tue, 27 Aug 2019 04:30:44 -0400 Received: from mail.kapsi.fi ([91.232.154.25]:37387 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728762AbfH0Iao (ORCPT ); Tue, 27 Aug 2019 04:30:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References :In-Reply-To:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=lz3osODEUPjBC59yNMazlxf9VZyBoemJKN2ReZcKz24=; b=kHnPKJyLEYuyDWZ85ep/6V8Rwf fafN7eUElmpmO0N5kbpdAunQoJutW0s7zZX+s8Z/uYb818FhHf/x4iFkEC8xz1B4ovpTv9AuaL7/Y ofPUbZYFZ/+A46RqQ8T7pQCVaFJUwnLQF9CKmOwQrABVo8YB+LxVRHgXKgwbkWqaNkuwLL1zmN1lS tWXsaaEWj+9VgTB48tTY5zYn0I7zx4KaVYfbhkuvO+h5ouoU8DZY7QiPjUXh2eIwXoXfeHHSN+dod uBuMs0hcfQbECxo883CQos81Pd4Ot8Zwv1LCcj9S2PCYPM6N+Nac2MRIOTj1g46yaRfnegLGiKYpV K5gUb7VQ==; Received: from [194.100.106.190] (helo=lettuce) by mail.kapsi.fi with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i2Ws5-0006NV-8h; Tue, 27 Aug 2019 11:30:33 +0300 Date: Tue, 27 Aug 2019 11:30:32 +0300 From: Emil Karlson To: Stanislaw Gruszka Cc: linux-wireless@vger.kernel.org, Felix Fietkau , Daniel Golle , Tomislav =?UTF-8?B?UG/FvmVnYQ==?= , Mathias Kresin , Fredrik Noring Subject: Re: [PATCH 5.3] rt2x00: clear up IV's on key removal Message-ID: <20190827113032.42e69b72@lettuce> In-Reply-To: <1566564483-31088-1-git-send-email-sgruszka@redhat.com> References: <1566564483-31088-1-git-send-email-sgruszka@redhat.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 194.100.106.190 X-SA-Exim-Mail-From: jekarl@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Fri, 23 Aug 2019 14:48:03 +0200 Stanislaw Gruszka wrote: > 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 > --- > 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)); } Seems to work when used with the previous patch on top of 5.3-rc6 tested-by: Emil Karlson