From patchwork Fri Jun 14 09:36:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 10994803 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF7111398 for ; Fri, 14 Jun 2019 09:36:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C13C2281DB for ; Fri, 14 Jun 2019 09:36:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B567F281E1; Fri, 14 Jun 2019 09:36:10 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable 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 3936C28249 for ; Fri, 14 Jun 2019 09:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727066AbfFNJgJ (ORCPT ); Fri, 14 Jun 2019 05:36:09 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37910 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726479AbfFNJgI (ORCPT ); Fri, 14 Jun 2019 05:36:08 -0400 Received: by mail-wr1-f67.google.com with SMTP id d18so1781410wrs.5 for ; Fri, 14 Jun 2019 02:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1tGskau943T386kyJZ4GTkvXE83xs6wkbIyb/EV2Rpk=; b=Y/CNx4L9VyVGfMTAWiKtKaJ81EJxZFYOlWZJ3RtsxYoKVeNFQt7lIQYQfdvxkDSVvO ChOqSLc6wManoqjid9a86zGIIdKkGPIPcyg/oIf81fM5DokeCm3cP9R4eQC3bv1+W0NS jTl0l23W5MXOqujBSEb9zOJX4fd/IxY+GWi/dY5y7SU9RPtLQFYDx5S7DRmnR+s3PWzl PVa4B+45zS0Y9ifdm2yhDL1wr5m96QeDQuNdExqdwYDomNfZzpiNHVKSr0aW2S440jbS Od6B1vXUzoJPvYPCgng1MpisQ7wJ0Ki3Cliu4GZ1DTqQqe//9yASEIeL6xmP6x8RbOVd Ot3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1tGskau943T386kyJZ4GTkvXE83xs6wkbIyb/EV2Rpk=; b=Tuo0hbaikSD77LeH0i4VLqJRjC2vbbRfQuzhpK+W6ufLLjb/wRAqdCb9d3g3/k8TS7 BkvgoVknQZQ7X4hbAU9gx/ZIl+ZLkYf9IQcXdrw3r2idOL245a2eqXTVAKFD1feWD5oW PU2ktxM+EPordw00OfhvD6k920iKyZ+DrRa+KXfu3Is9fLLfgYMySLYU+qO3EraOd4Bu JNkqQvxMhfjriAeKobxWixvchOtgpYdsL4aSGpuwn9LKkbitFO4bF8RhmC+zMqQH1Fdo +kOy7IWiaE1lMc2hP56fnZ/TDiToEUlRyWDXIk9ov9pm+5DXujYnf2iG4cFHiYHjUC8l J2jA== X-Gm-Message-State: APjAAAUmr0jQ9dB5AeJD2TusVpFGm9qBAOY3hpYRlSt/ZhmJ4hExrDYy MpoNC1pIeJQafET16KsFDWdIWFChYSkYsg== X-Google-Smtp-Source: APXvYqwyDSumK+XyFiqwW8Qv/hrRrcOr3E3Q/uHc65nZw1hG/n0VN2Xi20DbXVRgm6yP++3J911mbA== X-Received: by 2002:adf:afde:: with SMTP id y30mr2274806wrd.197.1560504966014; Fri, 14 Jun 2019 02:36:06 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:8d0e:a5b1:c005:e3b5]) by smtp.gmail.com with ESMTPSA id 11sm2965086wmd.23.2019.06.14.02.36.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jun 2019 02:36:05 -0700 (PDT) From: Ard Biesheuvel To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, linux-crypto@vger.kernel.org, ebiggers@kernel.org, herbert@gondor.apana.org.au, Ard Biesheuvel Subject: [PATCH] wireless: airo: switch to skcipher interface Date: Fri, 14 Jun 2019 11:36:03 +0200 Message-Id: <20190614093603.22771-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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 The AIRO driver applies a ctr(aes) on a buffer of considerable size (2400 bytes), and instead of invoking the crypto API to handle this in its entirety, it open codes the counter manipulation and invokes the AES block cipher directly. Let's fix this, by switching to the sync skcipher API instead. Signed-off-by: Ard Biesheuvel --- NOTE: build tested only, since I don't have the hardware drivers/net/wireless/cisco/airo.c | 57 ++++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c index 3f5a14112c6b..2d29ad10505b 100644 --- a/drivers/net/wireless/cisco/airo.c +++ b/drivers/net/wireless/cisco/airo.c @@ -49,6 +49,9 @@ #include #include +#include +#include + #include #include @@ -951,7 +954,7 @@ typedef struct { } mic_statistics; typedef struct { - u32 coeff[((EMMH32_MSGLEN_MAX)+3)>>2]; + __be32 coeff[((EMMH32_MSGLEN_MAX)+3)>>2]; u64 accum; // accumulated mic, reduced to u32 in final() int position; // current position (byte offset) in message union { @@ -1216,7 +1219,7 @@ struct airo_info { struct iw_spy_data spy_data; struct iw_public_data wireless_data; /* MIC stuff */ - struct crypto_cipher *tfm; + struct crypto_sync_skcipher *tfm; mic_module mod[2]; mic_statistics micstats; HostRxDesc rxfids[MPI_MAX_FIDS]; // rx/tx/config MPI350 descriptors @@ -1291,14 +1294,14 @@ static int flashrestart(struct airo_info *ai,struct net_device *dev); static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSeq); static void MoveWindow(miccntx *context, u32 micSeq); static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, - struct crypto_cipher *tfm); + struct crypto_sync_skcipher *tfm); static void emmh32_init(emmh32_context *context); static void emmh32_update(emmh32_context *context, u8 *pOctets, int len); static void emmh32_final(emmh32_context *context, u8 digest[4]); static int flashpchar(struct airo_info *ai,int byte,int dwelltime); static void age_mic_context(miccntx *cur, miccntx *old, u8 *key, int key_len, - struct crypto_cipher *tfm) + struct crypto_sync_skcipher *tfm) { /* If the current MIC context is valid and its key is the same as * the MIC register, there's nothing to do. @@ -1359,7 +1362,7 @@ static int micsetup(struct airo_info *ai) { int i; if (ai->tfm == NULL) - ai->tfm = crypto_alloc_cipher("aes", 0, 0); + ai->tfm = crypto_alloc_sync_skcipher("ctr(aes)", 0, 0); if (IS_ERR(ai->tfm)) { airo_print_err(ai->dev->name, "failed to load transform for AES"); @@ -1624,37 +1627,31 @@ static void MoveWindow(miccntx *context, u32 micSeq) /* mic accumulate */ #define MIC_ACCUM(val) \ - context->accum += (u64)(val) * context->coeff[coeff_position++]; - -static unsigned char aes_counter[16]; + context->accum += (u64)(val) * be32_to_cpu(context->coeff[coeff_position++]); /* expand the key to fill the MMH coefficient array */ static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, - struct crypto_cipher *tfm) + struct crypto_sync_skcipher *tfm) { /* take the keying material, expand if necessary, truncate at 16-bytes */ /* run through AES counter mode to generate context->coeff[] */ - int i,j; - u32 counter; - u8 *cipher, plain[16]; - - crypto_cipher_setkey(tfm, pkey, 16); - counter = 0; - for (i = 0; i < ARRAY_SIZE(context->coeff); ) { - aes_counter[15] = (u8)(counter >> 0); - aes_counter[14] = (u8)(counter >> 8); - aes_counter[13] = (u8)(counter >> 16); - aes_counter[12] = (u8)(counter >> 24); - counter++; - memcpy (plain, aes_counter, 16); - crypto_cipher_encrypt_one(tfm, plain, plain); - cipher = plain; - for (j = 0; (j < 16) && (i < ARRAY_SIZE(context->coeff)); ) { - context->coeff[i++] = ntohl(*(__be32 *)&cipher[j]); - j += 4; - } - } + SYNC_SKCIPHER_REQUEST_ON_STACK(req, tfm); + struct scatterlist dst, src; + u8 iv[AES_BLOCK_SIZE] = {}; + int ret; + + crypto_sync_skcipher_setkey(tfm, pkey, 16); + + sg_init_one(&dst, context->coeff, sizeof(context->coeff)); + sg_init_one(&src, page_address(ZERO_PAGE(0)), sizeof(context->coeff)); + + skcipher_request_set_sync_tfm(req, tfm); + skcipher_request_set_callback(req, 0, NULL, NULL); + skcipher_request_set_crypt(req, &src, &dst, sizeof(context->coeff), iv); + + ret = crypto_skcipher_encrypt(req); + WARN_ON_ONCE(ret); } /* prepare for calculation of a new mic */ @@ -2415,7 +2412,7 @@ void stop_airo_card( struct net_device *dev, int freeres ) ai->shared, ai->shared_dma); } } - crypto_free_cipher(ai->tfm); + crypto_free_sync_skcipher(ai->tfm); del_airo_dev(ai); free_netdev( dev ); }