From patchwork Mon Jul 10 13:45:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 107294 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp3443016qge; Mon, 10 Jul 2017 06:46:14 -0700 (PDT) X-Received: by 10.98.19.78 with SMTP id b75mr44611260pfj.212.1499694373948; Mon, 10 Jul 2017 06:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499694373; cv=none; d=google.com; s=arc-20160816; b=X3IHh5pB7Fn4EiIugGYlDd1597myV6KQKyW92YkgA/Dy6DAgSSinI1N180oN9TPfWv Tkzr5YbyiYjiesehR2On5DrP53EjazvMLhmA2KHbGGzklaAgelKhz1y/zJYZNbWIDHWu bpyRd7emMXIR6jf2LhDphLdsC2ll0hI1QfYX6Bui8Fs4mX4jQtbxKWMiySeqb+CbvbYG EX6MCEDqqvT00shfnXAjZMA21I/fUk26H9DkNW20SFHD7dPbNe1722gSFZ5IaCqGYI3A id1HcQtNyIgQ+tmlxV37aliWT0YaTMrUXIV8oYJakIo2CJPmmq88L8w6+3IRLcycKtxf 733Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=9w8DggOQyLApfHg6kk/lHQ1l+qmiHRPolGSlzzqfVZ4=; b=tKKgrN+Esm35cEGBNOZsxKhiqBy8AhK/norFb9iLEhI2Mrjmf0R/qu28BrD6AB36BD aufvQUd+pbA9v2mEnp4B4ZTHw43/m3DVTrpy93U1Vb000VvXksGnWDrxCn/juJQdtIDJ q0xYUOQa9uKvtl4euEogozK5jo9u08TLeRvhuJlWcVS4V3g+pO1hXnb5mlN6t3+uKFc5 5jp9t6Ic6BFxOFEM8PIGwsBE0xXk6II3eStmsBZQev6uo5dzPU8Xbjho+Cf6odObOlGw EjdHkzy52dxUuCeRSnE/j1OLGz3RG9qr3iMedXA2OoBK6zuxHr+PaOiPbdilFmHEdQn/ 5yZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=acwQWNQw; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t25si6389806pge.237.2017.07.10.06.46.13; Mon, 10 Jul 2017 06:46:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=acwQWNQw; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932145AbdGJNqM (ORCPT + 1 other); Mon, 10 Jul 2017 09:46:12 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:36486 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932079AbdGJNqL (ORCPT ); Mon, 10 Jul 2017 09:46:11 -0400 Received: by mail-wr0-f172.google.com with SMTP id c11so139620612wrc.3 for ; Mon, 10 Jul 2017 06:46:10 -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; bh=9w8DggOQyLApfHg6kk/lHQ1l+qmiHRPolGSlzzqfVZ4=; b=acwQWNQw4Idc+DxATv+aIBALW+kbs6dl+uE7uLqHjs6so1bGwVMMTU3CfPWKm/bDUX dG4bFUTq1oGs7J39cI20LpTyOW4vEXQvHu/QKcc/OejZ+Lpzegh9xSU1BOMu0XtObL1A cX3U2vHV1iy4k67YKyisjYhZXJqaOHOYIIM5g= 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; bh=9w8DggOQyLApfHg6kk/lHQ1l+qmiHRPolGSlzzqfVZ4=; b=alNUnse34+ii+h2mHZyR+JpdhWU3yFpJHsSPlsliayO0J342xwAaMciPqRZE8mcMfL o+o7DLjsHDoQTxo6bJtq6z4GmRPnd2/2ncTjAvHKPC/TIJNQmANrBdYc8iwye7g95/3J MjWefm0nXsjbqe9cgr0I+fnTyFDUuaioPC3rrj24WFlLjEuDmo3dyKgOWuOJEmqLNRko 4X+soblub+GORwhIavUdu57MHmRvBfkxkcJfKCS9kgdICP2Cwsbo7giJoTiQTCji5jdJ LsYG41Irk0oD2Y94qtDvIfuOrTT2jQ6AyV28bjB/2UEbdXUcizLrGfWKxnc3c57klS7p BFTg== X-Gm-Message-State: AIVw113okJuL5JPqYEZ6BlDcRq/Bw37jdy7Q31wRBXe000QiB/Ufmxg5 JcguEG6cIJnRfk06 X-Received: by 10.28.214.213 with SMTP id n204mr7973873wmg.114.1499694369735; Mon, 10 Jul 2017 06:46:09 -0700 (PDT) Received: from localhost.localdomain ([154.149.70.241]) by smtp.gmail.com with ESMTPSA id g63sm12139915wrd.11.2017.07.10.06.46.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 06:46:09 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au, ebiggers@google.com Cc: davem@davemloft.net, dm-devel@redhat.com, johannes@sipsolutions.net, linux-wireless@vger.kernel.org, agk@redhat.com, snitzer@redhat.com, Ard Biesheuvel Subject: [PATCH 0/2] crypto/algapi - refactor crypto_xor() to avoid memcpy()s Date: Mon, 10 Jul 2017 14:45:46 +0100 Message-Id: <20170710134548.20234-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org >From 2/2: """ There are quite a number of occurrences in the kernel of the pattern if (dst != src) memcpy(dst, src, walk.total % AES_BLOCK_SIZE); crypto_xor(dst, final, walk.total % AES_BLOCK_SIZE); or crypto_xor(keystream, src, nbytes); memcpy(dst, keystream, nbytes); where crypto_xor() is preceded or followed by a memcpy() invocation that is only there because crypto_xor() uses its output parameter as one of the inputs. """ Patch #1 is a preparatory patch, which is split off for ease of review. Patch #2 updates all occurrences of crypto_xor() to use a separate output argument. Ard Biesheuvel (2): crypto/algapi - use separate dst and src operands for __crypto_xor() crypto/algapi - make crypto_xor() take separate dst and src arguments arch/arm/crypto/aes-ce-glue.c | 4 +--- arch/arm/crypto/aes-neonbs-glue.c | 9 +++---- arch/arm64/crypto/aes-glue.c | 8 +++---- arch/arm64/crypto/aes-neonbs-glue.c | 9 +++---- arch/sparc/crypto/aes_glue.c | 3 +-- arch/x86/crypto/aesni-intel_glue.c | 4 ++-- arch/x86/crypto/blowfish_glue.c | 3 +-- arch/x86/crypto/cast5_avx_glue.c | 3 +-- arch/x86/crypto/des3_ede_glue.c | 3 +-- crypto/algapi.c | 25 ++++++++++++-------- crypto/ccm.c | 2 +- crypto/chacha20_generic.c | 4 ++-- crypto/cmac.c | 8 +++---- crypto/ctr.c | 7 +++--- crypto/cts.c | 4 ++-- crypto/gcm.c | 4 ++-- crypto/ghash-generic.c | 2 +- crypto/keywrap.c | 4 ++-- crypto/pcbc.c | 20 +++++++--------- crypto/salsa20_generic.c | 4 ++-- crypto/seqiv.c | 2 +- crypto/xcbc.c | 8 +++---- drivers/crypto/vmx/aes_ctr.c | 3 +-- drivers/md/dm-crypt.c | 19 +++++++-------- include/crypto/algapi.h | 12 ++++++---- include/crypto/cbc.h | 10 ++++---- net/mac80211/fils_aead.c | 6 ++--- 27 files changed, 89 insertions(+), 101 deletions(-) -- 2.9.3