From patchwork Fri Dec 8 13:32:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Govind Singh X-Patchwork-Id: 10102549 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EC821602A0 for ; Fri, 8 Dec 2017 13:32:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E578D28C86 for ; Fri, 8 Dec 2017 13:32:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA33C28C88; Fri, 8 Dec 2017 13:32:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE60B28C86 for ; Fri, 8 Dec 2017 13:32:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753262AbdLHNcI (ORCPT ); Fri, 8 Dec 2017 08:32:08 -0500 Received: from alexa-out.qualcomm.com ([129.46.98.28]:35620 "EHLO alexa-out.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752965AbdLHNcH (ORCPT ); Fri, 8 Dec 2017 08:32:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1512739928; x=1544275928; h=from:to:cc:subject:date:message-id; bh=7y7PcEbupkqP0mMM8Zfk3F2oPNO30GmybtX1S4Grtyo=; b=dV2z+sx2gVlsDnqu/W/bUG9jhNGD4jRpBd7bl7+A5VyBfPgD+g9oYY/i QwvF1fSNKb0o0Pz78SaDUfP9u1ud4rpuuXlKfQ3lWY+OgjAW4FyQUpo2f AXvuG2QJ/cpr8VISGD6lvknMfrV4bHOTHjN3zvXc29HuSPIktN5kzo0HU 0=; Received: from ironmsg04-r-new.qualcomm.com (HELO Ironmsg04-R.qualcomm.com) ([10.53.140.108]) by alexa-out.qualcomm.com with ESMTP; 08 Dec 2017 05:32:07 -0800 X-IronPort-AV: E=McAfee;i="5900,7806,8738"; a="1548189123" X-MGA-submission: =?us-ascii?q?MDHc1lAGrOQyWigqeTW0ZTAvQ6ClGvg3XKJDYU?= =?us-ascii?q?aCVbhnyTtk8ngRUxGNamE28L3Mujgwdqwbx5hXlrZiw8h0aaPCmRcS2M?= =?us-ascii?q?+IZbBfrbVoObiwGwnYFU3oOukbWOOORYBjKud4UYHNBThLbgGtGzqNca?= =?us-ascii?q?B+?= Received: from govinds-linux.qualcomm.com ([10.204.116.70]) by Ironmsg04-R.qualcomm.com with ESMTP; 08 Dec 2017 05:32:05 -0800 Received: by govinds-linux.qualcomm.com (Postfix, from userid 399420) id C1CA5358C; Fri, 8 Dec 2017 19:02:04 +0530 (IST) From: Govind Singh To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Govind Singh Subject: [PATCH 1/2] mac80211: Populate RSC counter in set_key method Date: Fri, 8 Dec 2017 19:02:02 +0530 Message-Id: <1512739922-1529-1-git-send-email-govinds@qti.qualcomm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Send RSC counter to driver in set_key method, so that FW/driver can drop the packet in PN check if received packet sequence no is less than current RSC counter during group keys(GTK) exchange. Signed-off-by: Govind Singh --- include/net/mac80211.h | 6 ++++-- net/mac80211/key.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 2ee4af2..2f0c91d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1564,6 +1564,8 @@ enum ieee80211_key_flags { IEEE80211_KEY_FLAG_RESERVE_TAILROOM = BIT(7), }; +#define IEEE80211_MAX_PN_LEN 16 + /** * struct ieee80211_key_conf - key information * @@ -1586,6 +1588,7 @@ enum ieee80211_key_flags { * - Temporal Authenticator Rx MIC Key (64 bits) * @icv_len: The ICV length for this key type * @iv_len: The IV length for this key type + * @rx_pn: Last received packet number, must be in little endian. */ struct ieee80211_key_conf { atomic64_t tx_pn; @@ -1596,11 +1599,10 @@ struct ieee80211_key_conf { u8 flags; s8 keyidx; u8 keylen; + u8 rx_pn[IEEE80211_MAX_PN_LEN]; u8 key[0]; }; -#define IEEE80211_MAX_PN_LEN 16 - #define TKIP_PN_TO_IV16(pn) ((u16)(pn & 0xffff)) #define TKIP_PN_TO_IV32(pn) ((u32)((pn >> 16) & 0xffffffff)) diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 9380493..15e1822 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -538,6 +538,12 @@ struct ieee80211_key * } memcpy(key->conf.key, key_data, key_len); INIT_LIST_HEAD(&key->list); + /* Assign receive packet sequence no, rx_pn remains in + * little endian format as seq is guaranteed to be in little + * endian format. + */ + if (seq) + memcpy(&key->conf.rx_pn, seq, seq_len); return key; }