Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 581A5C433ED for ; Wed, 12 May 2021 18:46:53 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F3BD661008 for ; Wed, 12 May 2021 18:46:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3BD661008 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VriH6vM6OQfSQXEIWUEOKrwCMepQ0Vb2vMecTPe42k4=; b=q0mT7UkoBpZRdXIDE8lPbyfDF +z6d0Bj42babLVQQadxMB1y7Z6lToYkaysb0RzVamBjwrdsY53/lsHN+72GZ/qfkYl9P/0XPuTSF+ +sehDRWCfcHrEIrINh8a8Iu7tlIMTNHJ12TpwbN53IwaD367XHG8SaxswdENKDoBhVGv3+zFuEO9W uwxyFJbuFUOAAIyQfuWlkm/c65sFjT6o55Rhs3vYFGbqIvoCg2oLajgYzvxuMArS1y0B9es5CONdL UESBq1O9Ge8rHcOMtUuNsdr0/urSNzUyPRRIYmSIrvpJBQehRga1cfeuTlh5vPPJh8Tq52jcSEN9r FaBrZ0CQw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgtr4-003gnQ-QE; Wed, 12 May 2021 18:45:10 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgtqn-003gks-1w for linux-arm-kernel@desiato.infradead.org; Wed, 12 May 2021 18:44:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=bIO9ENbnc5g3U1ZzsC5FAF5m4NJt0+ptlcTvWOhcMrI=; b=vpkN91RXqPlAba7ofRQ6PP59Od ctZdpSo38X1Lfq394A+v2D1j6QIXMycIr0sqfvaRxf3O8nzs7z/87KsqzIWKZ4CX5bERm+087vxH+ Wt0oru2mMNzYBYkMgaIPxNgLNPlyKn5HsUvSscGrW3S6BEQZEBjSeQfb/zZFJtr9+T/wYpvoSbCRv CfFpfxY4zXzjv7oXMsQfPsjMU3YbuipczhnSJPlgsQBQKP5jgAiwyWcHIURbm43BuTIyj/mkW3WT5 ZwjCQXSbPRKpdlPhPhLYSi0LVarbrbk7OHCrBvetqLCBUZzGjHtLKmuNRbzi4PkMPoOvV85vzYi/b pRqBbwpA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgtqk-00AieT-Ce for linux-arm-kernel@lists.infradead.org; Wed, 12 May 2021 18:44:51 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 504286141C; Wed, 12 May 2021 18:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620845090; bh=isWmI38USeF4NjdMkoUIY8ZmRIz+cWLvwEpazjfnYh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XZEm9yTT3ICvLwUoBNGxZGZS9t+cp+ZGmnNwEPUPmavpwQqIZirSnL90Q4RKx2Nqs fnl5Hd30euD37o9wmeOQVTy4E4Cbi83pdff4SGSydHpPUV75yTpNTDqMUpaOlU4uwL QwCrLRDikY5sDJ5OSs2hK6u/iINNmEHepHlNb0NP04BJhg/f5u392RPq87HTmT1etB bn2nKRwL3mpxbP830Z8cfJi3xwqu/VJRfj7gSaBz58zMF0GIlt7cEfKP5z+iDTkJ7k 5IfDQr3AGqX6rD6R8lAK808ET6MLqlt1JGI1onFRBkoJZbTo8lRXx5aAjUs7JTv4Np JSXDaaP4noP9w== From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, ebiggers@kernel.org, herbert@gondor.apana.org.au, will@kernel.org, kernel-team@android.com, Ard Biesheuvel Subject: [PATCH v3 2/7] crypto: aead - disallow en/decrypt for non-task or non-softirq context Date: Wed, 12 May 2021 20:44:34 +0200 Message-Id: <20210512184439.8778-3-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210512184439.8778-1-ardb@kernel.org> References: <20210512184439.8778-1-ardb@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210512_114450_485539_C4A65CAC X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to ensure that kernel mode SIMD routines will not need a scalar fallback if they run with softirqs disabled, disallow any use of the AEAD encrypt and decrypt routines from outside of task or softirq context. Signed-off-by: Ard Biesheuvel --- crypto/aead.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/crypto/aead.c b/crypto/aead.c index 16991095270d..b5304b3d3314 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -87,6 +87,11 @@ int crypto_aead_encrypt(struct aead_request *req) unsigned int cryptlen = req->cryptlen; int ret; + if (!(alg->cra_flags & CRYPTO_ALG_ASYNC) && + WARN_ONCE(!in_task() && !in_serving_softirq(), + "synchronous call from invalid context\n")) + return -EBUSY; + crypto_stats_get(alg); if (crypto_aead_get_flags(aead) & CRYPTO_TFM_NEED_KEY) ret = -ENOKEY; @@ -104,6 +109,11 @@ int crypto_aead_decrypt(struct aead_request *req) unsigned int cryptlen = req->cryptlen; int ret; + if (!(alg->cra_flags & CRYPTO_ALG_ASYNC) && + WARN_ONCE(!in_task() && !in_serving_softirq(), + "synchronous call from invalid context\n")) + return -EBUSY; + crypto_stats_get(alg); if (crypto_aead_get_flags(aead) & CRYPTO_TFM_NEED_KEY) ret = -ENOKEY; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel