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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 4CB8DC433DB for ; Wed, 3 Mar 2021 01:42:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0645564E62 for ; Wed, 3 Mar 2021 01:42:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236363AbhCCB2Q (ORCPT ); Tue, 2 Mar 2021 20:28:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:40154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378876AbhCBJFT (ORCPT ); Tue, 2 Mar 2021 04:05:19 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6129864DE4; Tue, 2 Mar 2021 09:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614675738; bh=/9iGZlMSTBpH3pvYK2XMp6jTFluRmMTYaBwnJWdiW6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JvdwB42Dh4PttZChpfMeQrxV9Kh6YQrGHN1qnIGTdznaDavl+WUI1TGzTQNvOiSoK PkR8b4PKCs8Q6nXjeD2gP+FGsSdjSGWhhRMBB5XZQMRY+APDE/LMumpf7WvrXyFQI6 xRReGhHxgoify9QeDpjd4X/aKQTe3bFj14Q22Ik9Z+MUzFHTOu1BicysbTdPVVco34 5mQ5HFUhyAPNpQK+y0rXPaiYI6aq1UlQzhVLrBDurg2VecZIlHOIPrdqYaKwqI2oR8 OFfmLT9H5hc4O3arH/iRkzfjMovkVqbs7+RKQjvcAqJ7rXH8Vilc8WphlJZjRv1it7 RqDGiLBep8amg== From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Dave Martin , Mark Brown , Herbert Xu , Eric Biggers , Will Deacon , Catalin Marinas , Thomas Gleixner , Peter Zijlstra , Sebastian Andrzej Siewior , Ingo Molnar , Andy Lutomirski Subject: [PATCH v2 5/9] crypto: skcipher - disallow en/decrypt for non-task or non-softirq context Date: Tue, 2 Mar 2021 10:01:14 +0100 Message-Id: <20210302090118.30666-6-ardb@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302090118.30666-1-ardb@kernel.org> References: <20210302090118.30666-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.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 a15376245416..d1a2ba6eacbe 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -623,6 +623,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; @@ -640,6 +645,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.30.1 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.0 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 F129FC433E6 for ; Tue, 2 Mar 2021 09:03:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 8E0F364F12 for ; Tue, 2 Mar 2021 09:03:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E0F364F12 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dTMqN5rZzKaAClVftbWj0nAmcs6txA6dvAKu3IeBYtc=; b=OHqyYltASinMRFwecUumzHoGU lMYHHcIVhmEIJkmJyqTY7aizCBpSwBVoaMZK/MF/ryQ9vOoGehYKTVmSeUaMYbOXWlxNEInN0AEZc mfP4tSSBh0AHqPcY07svmU/3BxwSzIf1WLLDpDH7r791Lmp3Z8cQ1Yhope51rp+1nN9wOPFGC8RUL Q7rtqazG9mJ/mO4lXJRI/tzLk48Qf88RjhTljLAErXwY6d57F0CS0rqn6nR5SF05kKL8fId7FvyG8 sNPZk6i65/IlkGmNABtgrouVFsgccKg09M6cxCpz9XCSwN2Ca0cypXRNKVQgJl6Y3+vu5mwHCdrQY OUSBBWsDQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lH0vA-0006Rd-8y; Tue, 02 Mar 2021 09:02:24 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lH0v5-0006QP-IM for linux-arm-kernel@lists.infradead.org; Tue, 02 Mar 2021 09:02:21 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6129864DE4; Tue, 2 Mar 2021 09:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614675738; bh=/9iGZlMSTBpH3pvYK2XMp6jTFluRmMTYaBwnJWdiW6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JvdwB42Dh4PttZChpfMeQrxV9Kh6YQrGHN1qnIGTdznaDavl+WUI1TGzTQNvOiSoK PkR8b4PKCs8Q6nXjeD2gP+FGsSdjSGWhhRMBB5XZQMRY+APDE/LMumpf7WvrXyFQI6 xRReGhHxgoify9QeDpjd4X/aKQTe3bFj14Q22Ik9Z+MUzFHTOu1BicysbTdPVVco34 5mQ5HFUhyAPNpQK+y0rXPaiYI6aq1UlQzhVLrBDurg2VecZIlHOIPrdqYaKwqI2oR8 OFfmLT9H5hc4O3arH/iRkzfjMovkVqbs7+RKQjvcAqJ7rXH8Vilc8WphlJZjRv1it7 RqDGiLBep8amg== From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Subject: [PATCH v2 5/9] crypto: skcipher - disallow en/decrypt for non-task or non-softirq context Date: Tue, 2 Mar 2021 10:01:14 +0100 Message-Id: <20210302090118.30666-6-ardb@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302090118.30666-1-ardb@kernel.org> References: <20210302090118.30666-1-ardb@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_040219_904692_65D48F98 X-CRM114-Status: GOOD ( 10.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ingo Molnar , Herbert Xu , Peter Zijlstra , Catalin Marinas , Sebastian Andrzej Siewior , Dave Martin , Eric Biggers , Mark Brown , Andy Lutomirski , Thomas Gleixner , Will Deacon , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org 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 a15376245416..d1a2ba6eacbe 100644 --- a/crypto/skcipher.c +++ b/crypto/skcipher.c @@ -623,6 +623,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; @@ -640,6 +645,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.30.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel