From mboxrd@z Thu Jan 1 00:00:00 1970 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 398FAC433B4 for ; Wed, 12 May 2021 18:47:13 +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 C6AA761042 for ; Wed, 12 May 2021 18:47:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6AA761042 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=PwmvrMOOhq0ZlBoWhnWl4GplRY0j/Fif08+U3Y7iSVE=; b=PjlIRlVE6XwkT9PcyMlNVr6/M owlmONDG3fENhfLN/6WvjwrWiPkInA3HZrTYdmsF2vRAZ5lHQh6x/mGlfyIIudy6XXKZKy7ajkfME WbcegJQVX/y+nlN/LEHTCyd4AmJK/wjP3FJvMcw4EgWQmeop9TK0zOpBLZgxeGAxPA8P2TNzucNqH f/5rgEIWDrWSChweiBj7l1XzMo7liPBT/ysNIXmuEhc4RBTGE61985FH2IkyiT9eYMNME/1MIoSZD uoETblhc95+En2bT64LQWbfDauOEgKnvoC6Shz3kyrx7tM8W26LvSml66tBNn1Jl0EP4wdbtDf5yk RrSj/E0LA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgtrD-003goL-T5; Wed, 12 May 2021 18:45:20 +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 1lgtqo-003gkv-TM for linux-arm-kernel@desiato.infradead.org; Wed, 12 May 2021 18:44:55 +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=kOdgZQd+Pb7zxHsvXbSeS5mKDSGq0alPQyzrOlxQdtU=; b=QyiSdkzLmi5UpA2Be9SJMLvEQt y9szpK2C1KQjBSgLFn1Mtt0kI59FCAXOvm/i7FApKMAzcCT5zvjmvOYHeXHTU+zx+d+qjry4UGruH TeWhB+I7dyqghlMXyA1C02a01XvyADJEq+eSfBLQsgR2cE9KrQWPiwGIv603gT32ZlRFVDdUJrzAb Ogrl+67Evcwsc/rZ1gPnm17Dz5vwR6UIvPyDs+TKK3SZGLtde5oQy49ii15CIGuo25JGaBagVuMeW Ywrgu9f7ZCGITh1FPLYqwOrgIoR4clcJI0QCe67fWvcj3taKPx2kp6TCvY24os49SHXH810j4khvh 84TGeuIA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgtqm-00Aieq-G5 for linux-arm-kernel@lists.infradead.org; Wed, 12 May 2021 18:44:53 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6572F6142D; Wed, 12 May 2021 18:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620845092; bh=SmBuw5/my1vcoFAJsK9Niemsp+zYVD3mIjyRu1+S350=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GXHvPcUMlEhYbcijXWwlUHQgce2c9Ib9yTDzmBL4YG7dnOovASp0AjESwfNexi3QE USE/L1kR0UTx8lM3Jtp1NXrWqfv6DAsUPxwUpe198I8lhPrPo0nzOk/B1r7J330X3l n2WCj86XfHHqndgPDjzSanXjYetPIDpRg3TXSpgvN6OXXRGejRyYvO4//TwOfO0eBO NCuO+BD1cVikdBMVEXgaiFI62j0AxqbWu13dOzhtabaj/jPGHQ87oW5Qu89lVkla6a FCIWhp2EFhbXAL6LcJTvpT4L80eqrLB6kxzmRQvZLbQM0HhzRrt8aLSHAY6rxARqUl /NwdIq++nIMRQ== 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 3/7] crypto: skcipher - disallow en/decrypt for non-task or non-softirq context Date: Wed, 12 May 2021 20:44:35 +0200 Message-Id: <20210512184439.8778-4-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_114452_591084_5F166F7D 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 skcipher encrypt and decrypt routines from outside of task or softirq context. Signed-off-by: Ard Biesheuvel --- crypto/skcipher.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/crypto/skcipher.c b/crypto/skcipher.c index 93fdacf49697..9bce5350008b 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -625,6 +625,11 @@ int crypto_skcipher_encrypt(struct skcipher_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_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) ret = -ENOKEY; @@ -642,6 +647,11 @@ int crypto_skcipher_decrypt(struct skcipher_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_skcipher_get_flags(tfm) & 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