linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Lutomirski <luto@kernel.org>
To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
Cc: Eric Biggers <ebiggers3@gmail.com>,
	linux-crypto@vger.kernel.org,
	Herbert Xu <herbert@gondor.apana.org.au>,
	Stephan Mueller <smueller@chronox.de>,
	Andy Lutomirski <luto@kernel.org>
Subject: [PATCH] crypto: Make a few drivers depend on !VMAP_STACK
Date: Mon, 12 Dec 2016 12:55:20 -0800	[thread overview]
Message-ID: <5e4b1fdd48e44acd5f3cfa25639b00f5c5906832.1481575835.git.luto@kernel.org> (raw)
In-Reply-To: <8c273c9c41f51b34bb3115086f1d776895580637.1481575835.git.luto@kernel.org>

Eric Biggers found several crypto drivers that point scatterlists at
the stack.  These drivers should never load on x86, but, for future
safety, make them depend on !VMAP_STACK.

No -stable backport should be needed as no released kernel
configuration should be affected.

Reported-by: Eric Biggers <ebiggers3@gmail.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
 drivers/crypto/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 4d2b81f2b223..481e67e54ffd 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -245,7 +245,7 @@ config CRYPTO_DEV_TALITOS
 	select CRYPTO_BLKCIPHER
 	select CRYPTO_HASH
 	select HW_RANDOM
-	depends on FSL_SOC
+	depends on FSL_SOC && !VMAP_STACK
 	help
 	  Say 'Y' here to use the Freescale Security Engine (SEC)
 	  to offload cryptographic algorithm computation.
@@ -357,7 +357,7 @@ config CRYPTO_DEV_PICOXCELL
 
 config CRYPTO_DEV_SAHARA
 	tristate "Support for SAHARA crypto accelerator"
-	depends on ARCH_MXC && OF
+	depends on ARCH_MXC && OF && !VMAP_STACK
 	select CRYPTO_BLKCIPHER
 	select CRYPTO_AES
 	select CRYPTO_ECB
@@ -410,7 +410,7 @@ endif # if CRYPTO_DEV_UX500
 
 config CRYPTO_DEV_BFIN_CRC
 	tristate "Support for Blackfin CRC hardware"
-	depends on BF60x
+	depends on BF60x && !VMAP_STACK
 	help
 	  Newer Blackfin processors have CRC hardware. Select this if you
 	  want to use the Blackfin CRC module.
@@ -487,7 +487,7 @@ source "drivers/crypto/qat/Kconfig"
 
 config CRYPTO_DEV_QCE
 	tristate "Qualcomm crypto engine accelerator"
-	depends on (ARCH_QCOM || COMPILE_TEST) && HAS_DMA && HAS_IOMEM
+	depends on (ARCH_QCOM || COMPILE_TEST) && HAS_DMA && HAS_IOMEM && !VMAP_STACK
 	select CRYPTO_AES
 	select CRYPTO_DES
 	select CRYPTO_ECB
-- 
2.9.3

  parent reply	other threads:[~2016-12-12 20:55 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-12 20:52 [PATCH] wusbcore: Fix one more crypto-on-the-stack bug Andy Lutomirski
2016-12-12 20:53 ` [PATCH] keys/encrypted: Fix two crypto-on-the-stack bugs Andy Lutomirski
2016-12-13 12:20   ` David Laight
2016-12-13 16:40     ` Andy Lutomirski
2016-12-14 16:58       ` Joerg Roedel
2016-12-13 16:45     ` David Howells
2016-12-13 17:02       ` Andy Lutomirski
2016-12-13 20:02       ` David Howells
2016-12-12 20:54 ` [PATCH] cifs: Fix smbencrypt() to stop pointing a scatterlist at the stack Andy Lutomirski
2016-12-13 11:40   ` Sergei Shtylyov
2016-12-13 13:07   ` Jeff Layton
2016-12-14  8:19     ` Steve French
2016-12-12 20:55 ` Andy Lutomirski [this message]
2016-12-13  3:42   ` [PATCH] crypto: Make a few drivers depend on !VMAP_STACK Herbert Xu
2016-12-12 20:55 ` [PATCH] orinoco: Use shash instead of ahash for MIC calculations Andy Lutomirski
2016-12-13  7:54   ` Eric Biggers
2016-12-13 11:35   ` Kalle Valo
2016-12-13 16:41     ` Andy Lutomirski
2016-12-13 17:03       ` Kalle Valo
2016-12-30 11:34   ` Kalle Valo
2016-12-30 12:02     ` Kalle Valo
2016-12-30 12:15       ` Kalle Valo
2016-12-12 21:44 ` [PATCH] wusbcore: Fix one more crypto-on-the-stack bug Greg KH
2016-12-12 23:57   ` Andy Lutomirski
2016-12-12 22:28 ` [PATCH] keys/encrypted: Fix two crypto-on-the-stack bugs David Howells
2016-12-13  0:32   ` Andy Lutomirski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5e4b1fdd48e44acd5f3cfa25639b00f5c5906832.1481575835.git.luto@kernel.org \
    --to=luto@kernel.org \
    --cc=ebiggers3@gmail.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=smueller@chronox.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).