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@xxxxxxxxx> Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
