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.4 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,URIBL_BLOCKED,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 51922C433B4 for ; Wed, 19 May 2021 12:56:47 +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 104E760FD9 for ; Wed, 19 May 2021 12:56:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 104E760FD9 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=AcZDem0Tt0XX0AtseWC+lcBMmFjLHTLdgRKnmWg++c8=; b=M/G2MjamIYn83/XpSGMssq5gW W1y0OJrf1z7IgCu0caRkB5dk+IdHiSzR7KrSzo1YzhxxgNOuzxB7WB3PGHHTdDkYM2jTdskDTb73f 6+09bihnWBTW+PIPtbVcPYs982eztv0Wu7iTx5CGzxKXgnPg485npqL1v3Y3LDjjd1TiZiUedIoqv SzMSrG1n3IXEf6/8XuEFABMz0RHhB5Hs7arOBh5KTPl+nA2HX62pvWPshvkb90/Qwp4oJAfd7lMQ6 7eqMQ29/qpRVF8FIuJF1rmopuU6tPwQ4Ve/tZRXOjBvf69wh6oot5PLgnfob/HS7TqKmW0N5LoT9P ch7caFZsw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljLjH-003z0k-OR; Wed, 19 May 2021 12:55:16 +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 1ljKHt-003kjT-Da for linux-arm-kernel@desiato.infradead.org; Wed, 19 May 2021 11:22: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=jnUiG5Y8fqhLbmdp9ESaxb3riucaiuuQE3KmZyP5x9c=; b=uUbKTSWp3GJCb4LLFgSlKfQR10 Hifh0/1ZTuMur5M3fCiKmGn66yYv8JsieEgnAYfwHt/cGnPAVAPTwCAMpQwRQJvIbz6vn/gk386Ul aua7QRIsPpvS68HP9RTpTpdnFtxFBhXdxJQevAB2hxm/L+mWtFve62UAGfVI0VnIyhYGCKDjjCd1J 2OHuuCH2G+0pD3Z63hpjeg0cPsRWDZjw4KrlN0jqwdrXvTNyKnAYE7Ji627cLSSqcqMgv6Bdct/ke mlNFZnkVRmJwQj4ElfoZ1WvvIbzhv66gSwbFCSQMQv3DT1S3hPiEVRhI+j/A6iS0NAt57UeOOipW3 0jVNhabw==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljKHq-00FP19-Mw for linux-arm-kernel@lists.infradead.org; Wed, 19 May 2021 11:22:51 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id E7118611BF; Wed, 19 May 2021 11:22:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621423370; bh=813vbDqlVp4TbHnw89ag9TrBuAfoPXQrAusOPwlb2rU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Brw1T6XE0yCFB5iVo+miBtWO8wz4UmajA8EcKnQkX+4YMT4KaR5x1w+u/43HZmBTY R5Lr+tI0o0GiEDOIV5/LeSboXD//qyI8cJMBUzwu+qisa5jWp6j04X66NfJfEXP9kQ jQUZ7EcX9TZzF2cBGylXEux4s8q2cFeIAjz2eLjbkZAouhtv9h4Q/v6k0gwOtq36xy 61NSvBJqQwaL0SUj2MdS/dDY3hGApJtK8OBBOmoRxIEvzTY5lkzchfsj85cN+XtKQw W/95vEJof393JQGZ0wNnOB7OhIAB2oH/36Iou+gUO6y6fjOwx6QC08XACLAeDV3ksS +K1NdC5y82KCg== 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 v4 3/7] crypto: skcipher - disallow en/decrypt for non-task or non-softirq context Date: Wed, 19 May 2021 13:22:35 +0200 Message-Id: <20210519112239.33664-4-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210519112239.33664-1-ardb@kernel.org> References: <20210519112239.33664-1-ardb@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210519_042250_785271_7BF8E5CF X-CRM114-Status: GOOD ( 11.15 ) 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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/crypto/skcipher.c b/crypto/skcipher.c index ed2deb031742..f69492aab75d 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -628,7 +628,11 @@ int crypto_skcipher_encrypt(struct skcipher_request *req) int ret; crypto_stats_get(alg); - if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) + if (!(alg->cra_flags & CRYPTO_ALG_ASYNC) && + WARN_ONCE(!in_task() && !in_serving_softirq(), + "synchronous call from invalid context\n")) + ret = -EBUSY; + else if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) ret = -ENOKEY; else ret = crypto_skcipher_alg(tfm)->encrypt(req); @@ -645,7 +649,11 @@ int crypto_skcipher_decrypt(struct skcipher_request *req) int ret; crypto_stats_get(alg); - if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) + if (!(alg->cra_flags & CRYPTO_ALG_ASYNC) && + WARN_ONCE(!in_task() && !in_serving_softirq(), + "synchronous call from invalid context\n")) + ret = -EBUSY; + else if (crypto_skcipher_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) ret = -ENOKEY; else ret = crypto_skcipher_alg(tfm)->decrypt(req); -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel