From patchwork Wed Jul 1 15:07:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= X-Patchwork-Id: 1320612 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silabs.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=silabs.onmicrosoft.com header.i=@silabs.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-silabs-onmicrosoft-com header.b=PESL5l14; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xl4T2GRTz9sTd for ; Thu, 2 Jul 2020 01:09:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731963AbgGAPJM (ORCPT ); Wed, 1 Jul 2020 11:09:12 -0400 Received: from mail-bn8nam12on2072.outbound.protection.outlook.com ([40.107.237.72]:60865 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731780AbgGAPIe (ORCPT ); Wed, 1 Jul 2020 11:08:34 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S68QMCsToCvYzqlnINJY+6L6yb5TS+vlvaHc1vVRynLKZvNtMBp9pyD30dByIKE1SvN6P7V+mSz+rViXKaGjpmMSnuq55t7JSPu7aWbGnTkM3znD1IflzSNlfdunstKT1uhljvSq4GTdd/ytuCQb9ezXz1oLlkn0j+9u372PmhYFy8QV+TB/0rdPHd5t6lrTgjTiF7CJNzKXv4NllYqsgec6BiW5dNn2v1PNlew2N3oEBUIIEXOwF+btRufJmxGeZt/KD6/i+E0HagL95TcqJfiU5FPPWeCfyqwIzA2fozdFu7sUK2AEXg24Mzdu9YZFKhQIJDlDtm7btOVY0vD2Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R6b7vknL1fmLF2G45nV1ZuX4yW8ngc6jD/djmpaSsGo=; b=N0XAP0HcMqtZkb9+bclAVcxxzo0ITLUvou8Hdd0frhAswSsKjlzc5fQw2JGAUb6HAFiJWY5fC4YBCQBRFUuCHC0UxFyAJjylGDPrJ531/z4dVBsA8L+nLGSabB6nc63vEZshmw1fu4tDZZRWHoZ9RVvuwP7jfp+dXS/dP3f+xDW0z309vHjwvfoYXdYa/JkxV1Z2y0xAIdvRkcVrX51Q2N2Chx0zhgYFbVY7/avaMDT1sHiZEgewwKVvrWRS8I0LCKGsHEQo1lvvvN4O5muCJMOZCiXbyZ1Pll9ZBowz45WVqxKbm/HxZrGQpllh8i27bRH6yCfUn+HjNSPJ8y0rcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=silabs.com; dmarc=pass action=none header.from=silabs.com; dkim=pass header.d=silabs.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silabs.onmicrosoft.com; s=selector2-silabs-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R6b7vknL1fmLF2G45nV1ZuX4yW8ngc6jD/djmpaSsGo=; b=PESL5l14KSrMK/b0kwEzJdRYgHLJ282X7PmsI2xn1Jpi3LBds2asJIAEEX0Nllwjk5xLYQo1hl5I8BEvqMP8RAJTMXKywFelIz0CAVYs+MvDMg+pOVZPod7+iMS3/ZSdHvY9e9A1uhr/iFrGaMJy/GW5bhV7dRHuhpLm3kI6Lbg= Authentication-Results: driverdev.osuosl.org; dkim=none (message not signed) header.d=none;driverdev.osuosl.org; dmarc=none action=none header.from=silabs.com; Received: from SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) by SA0PR11MB4736.namprd11.prod.outlook.com (2603:10b6:806:9f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.22; Wed, 1 Jul 2020 15:08:20 +0000 Received: from SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::c504:2d66:a8f7:2336]) by SN6PR11MB2718.namprd11.prod.outlook.com ([fe80::c504:2d66:a8f7:2336%7]) with mapi id 15.20.3131.033; Wed, 1 Jul 2020 15:08:20 +0000 From: Jerome Pouiller To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Kalle Valo , "David S . Miller" , =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= Subject: [PATCH 10/13] staging: wfx: simplify handling of encrypted frames Date: Wed, 1 Jul 2020 17:07:04 +0200 Message-Id: <20200701150707.222985-11-Jerome.Pouiller@silabs.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200701150707.222985-1-Jerome.Pouiller@silabs.com> References: <20200701150707.222985-1-Jerome.Pouiller@silabs.com> X-ClientProxiedBy: DM5PR07CA0143.namprd07.prod.outlook.com (2603:10b6:3:13e::33) To SN6PR11MB2718.namprd11.prod.outlook.com (2603:10b6:805:63::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pc-42.silabs.com (2a01:e35:2435:66a0:544b:f17b:7ae8:fb7) by DM5PR07CA0143.namprd07.prod.outlook.com (2603:10b6:3:13e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.21 via Frontend Transport; Wed, 1 Jul 2020 15:08:18 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [2a01:e35:2435:66a0:544b:f17b:7ae8:fb7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfce7e93-f286-4fe7-fd6d-08d81dd0974d X-MS-TrafficTypeDiagnostic: SA0PR11MB4736: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 04519BA941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xyoaaWMzB8yML1Av7vf5WlIQdyH2lYiACo8UWyKlfSwrQgBjogxft9jKRDFtMYsbRRA9Amy7LAxF6NuUs0CLm1wLNY/UA/ife3Qnyq2LC6NgmuzPbmj8ya0OICh8eUw72BbXsy672eGcOtbyHMcYb3a+RlWbdpgjJn4RgA8U8p5ID3ErtA+Wk6rOE5WVjKE0BKJNMVU2NNk7d2IBFLDqGClynqM0bB1b696Z1XbARCGe04237yIZS4plB7rIisggy+/ssL4d4ziCVWnlQF9DQMwMhF7ig58C8uCN4uQpQZf1KULqRFkRcAnqbrj0Csxm4oa/67L+GCgB2bB3y5Ym8Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2718.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(39850400004)(366004)(346002)(376002)(396003)(136003)(5660300002)(6486002)(86362001)(6666004)(66574015)(36756003)(2906002)(186003)(83380400001)(16526019)(8936002)(66556008)(66476007)(107886003)(4326008)(8676002)(2616005)(1076003)(478600001)(316002)(54906003)(66946007)(52116002)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: lzCiDyUbt6pmgFrZks+GLAfgb86XMc95iz/B5x0y3kw+jT0w53MTXN229bX+A/tG5uvH1QnuG4y554yPTcQJkb0/6o+so0ZZdKu1H1Ro9hxvaoSRQNv66yu2slBsGsc6zGoIISWjiijdISoV7DSpoKIUZDKQkDc6Hy/jZYpsOS6PRZXTEiCxARhdeJcanOLphLwHoA2nssHtcFeSnx5UZ6DIHkp6UoLi23hRmUJUpYOxKpi7ZF0H9aUNmLD6h1/VlCtZxAZwY/2Z4CM5PdGs9qGtDbB+9P8c+nmWzXJCABBsvZsDDjcTN2JCt3D1bk9K/5obZdDaDCMMF3p5GPOjTymPtneeSp69lFExjH0Pr9IBETd4nsLGIM139vWHQPdrhswIwqKenBP+gMmDhb9ij5Qg5bw+yJm/SAqNS3HeQDAYsbNpGyEa6RDEHq59s7DFM+tC/xlvL/eS+DRrQgGRjOHsPyP7j7eXOaVVcihxl3Qoc1O0V3FsTqZvags6Ep3CjFjbOZfN8OHK5Ul+KYJHyrx/SfCAvM39uR55WEFCQOw= X-OriginatorOrg: silabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfce7e93-f286-4fe7-fd6d-08d81dd0974d X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2718.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2020 15:08:20.4207 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 54dbd822-5231-4b20-944d-6f4abcd541fb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dPYS8KUGYq1340NlcQQjho7HEEYeKxnWectYjoZxjCUvoVWZovEKYgXdIyrDwVtmDsQOR00w2SXIUytY4cbhvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4736 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jérôme Pouiller We don't want mac80211 try to check MMIC and other security mechanisms. So, the driver remove all the data related to the encryption (IV, ICV, MMIC). However, enabling RX_FLAG_PN_VALIDATED is sufficient for that. So, drop the useless function wfx_drop_encrypt_data() and enable RX_FLAG_PN_VALIDATED. Signed-off-by: Jérôme Pouiller --- drivers/staging/wfx/data_rx.c | 60 ++--------------------------------- 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/drivers/staging/wfx/data_rx.c b/drivers/staging/wfx/data_rx.c index 316c2f1537fe5..60e2e5cb4656a 100644 --- a/drivers/staging/wfx/data_rx.c +++ b/drivers/staging/wfx/data_rx.c @@ -13,57 +13,6 @@ #include "bh.h" #include "sta.h" -static int wfx_drop_encrypt_data(struct wfx_dev *wdev, - const struct hif_ind_rx *arg, - struct sk_buff *skb) -{ - struct ieee80211_hdr *frame = (struct ieee80211_hdr *)skb->data; - size_t hdrlen = ieee80211_hdrlen(frame->frame_control); - size_t iv_len, icv_len; - - /* Oops... There is no fast way to ask mac80211 about - * IV/ICV lengths. Even defineas are not exposed. - */ - switch (arg->rx_flags.encryp) { - case HIF_RI_FLAGS_WEP_ENCRYPTED: - iv_len = 4 /* WEP_IV_LEN */; - icv_len = 4 /* WEP_ICV_LEN */; - break; - case HIF_RI_FLAGS_TKIP_ENCRYPTED: - iv_len = 8 /* TKIP_IV_LEN */; - icv_len = 4 /* TKIP_ICV_LEN */ - + 8 /*MICHAEL_MIC_LEN*/; - break; - case HIF_RI_FLAGS_AES_ENCRYPTED: - iv_len = 8 /* CCMP_HDR_LEN */; - icv_len = 8 /* CCMP_MIC_LEN */; - break; - case HIF_RI_FLAGS_WAPI_ENCRYPTED: - iv_len = 18 /* WAPI_HDR_LEN */; - icv_len = 16 /* WAPI_MIC_LEN */; - break; - default: - dev_err(wdev->dev, "unknown encryption type %d\n", - arg->rx_flags.encryp); - return -EIO; - } - - /* Firmware strips ICV in case of MIC failure. */ - if (arg->status == HIF_STATUS_RX_FAIL_MIC) - icv_len = 0; - - if (skb->len < hdrlen + iv_len + icv_len) { - dev_warn(wdev->dev, "malformed SDU received\n"); - return -EIO; - } - - /* Remove IV, ICV and MIC */ - skb_trim(skb, skb->len - icv_len); - memmove(skb->data + iv_len, skb->data, hdrlen); - skb_pull(skb, iv_len); - return 0; -} - void wfx_rx_cb(struct wfx_vif *wvif, const struct hif_ind_rx *arg, struct sk_buff *skb) { @@ -103,13 +52,8 @@ void wfx_rx_cb(struct wfx_vif *wvif, hdr->signal = arg->rcpi_rssi / 2 - 110; hdr->antenna = 0; - if (arg->rx_flags.encryp) { - if (wfx_drop_encrypt_data(wvif->wdev, arg, skb)) - goto drop; - hdr->flag |= RX_FLAG_DECRYPTED | RX_FLAG_IV_STRIPPED; - if (arg->rx_flags.encryp == HIF_RI_FLAGS_TKIP_ENCRYPTED) - hdr->flag |= RX_FLAG_MMIC_STRIPPED; - } + if (arg->rx_flags.encryp) + hdr->flag |= RX_FLAG_DECRYPTED | RX_FLAG_PN_VALIDATED; /* Filter block ACK negotiation: fully controlled by firmware */ if (ieee80211_is_action(frame->frame_control) &&