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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 F0EA5C43381 for ; Sun, 24 Feb 2019 06:09:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA56320663 for ; Sun, 24 Feb 2019 06:09:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727798AbfBXGI6 (ORCPT ); Sun, 24 Feb 2019 01:08:58 -0500 Received: from vmicros1.altlinux.org ([194.107.17.57]:43672 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725817AbfBXGI5 (ORCPT ); Sun, 24 Feb 2019 01:08:57 -0500 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id F0E8772CCAF; Sun, 24 Feb 2019 09:08:54 +0300 (MSK) Received: from beacon.altlinux.org (unknown [185.6.174.98]) by imap.altlinux.org (Postfix) with ESMTPSA id B83D94A4AE7; Sun, 24 Feb 2019 09:08:54 +0300 (MSK) From: Vitaly Chikunov To: Herbert Xu , David Howells , Mimi Zohar , linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 02/10] crypto: akcipher - check the presence of callback before the call Date: Sun, 24 Feb 2019 09:08:20 +0300 Message-Id: <20190224060828.2527-3-vt@altlinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190224060828.2527-1-vt@altlinux.org> References: <20190224060828.2527-1-vt@altlinux.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Because with introduction of EC-RDSA and change in workings of RSA in regard to sign/verify, akcipher could have not all callbacks defined, check the presence of callbacks before calling them to increase robustness. Signed-off-by: Vitaly Chikunov --- include/crypto/akcipher.h | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/include/crypto/akcipher.h b/include/crypto/akcipher.h index 2d690494568c..f537fad1989f 100644 --- a/include/crypto/akcipher.h +++ b/include/crypto/akcipher.h @@ -268,7 +268,10 @@ static inline unsigned int crypto_akcipher_maxsize(struct crypto_akcipher *tfm) { struct akcipher_alg *alg = crypto_akcipher_alg(tfm); - return alg->max_size(tfm); + if (alg->max_size) + return alg->max_size(tfm); + else + return 0; } /** @@ -287,10 +290,11 @@ static inline int crypto_akcipher_encrypt(struct akcipher_request *req) struct akcipher_alg *alg = crypto_akcipher_alg(tfm); struct crypto_alg *calg = tfm->base.__crt_alg; unsigned int src_len = req->src_len; - int ret; + int ret = -ENOSYS; crypto_stats_get(calg); - ret = alg->encrypt(req); + if (alg->encrypt) + ret = alg->encrypt(req); crypto_stats_akcipher_encrypt(src_len, ret, calg); return ret; } @@ -311,10 +315,11 @@ static inline int crypto_akcipher_decrypt(struct akcipher_request *req) struct akcipher_alg *alg = crypto_akcipher_alg(tfm); struct crypto_alg *calg = tfm->base.__crt_alg; unsigned int src_len = req->src_len; - int ret; + int ret = -ENOSYS; crypto_stats_get(calg); - ret = alg->decrypt(req); + if (alg->decrypt) + ret = alg->decrypt(req); crypto_stats_akcipher_decrypt(src_len, ret, calg); return ret; } @@ -334,10 +339,11 @@ static inline int crypto_akcipher_sign(struct akcipher_request *req) struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); struct akcipher_alg *alg = crypto_akcipher_alg(tfm); struct crypto_alg *calg = tfm->base.__crt_alg; - int ret; + int ret = -ENOSYS; crypto_stats_get(calg); - ret = alg->sign(req); + if (alg->sign) + ret = alg->sign(req); crypto_stats_akcipher_sign(ret, calg); return ret; } @@ -357,10 +363,11 @@ static inline int crypto_akcipher_verify(struct akcipher_request *req) struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); struct akcipher_alg *alg = crypto_akcipher_alg(tfm); struct crypto_alg *calg = tfm->base.__crt_alg; - int ret; + int ret = -ENOSYS; crypto_stats_get(calg); - ret = alg->verify(req); + if (alg->verify) + ret = alg->verify(req); crypto_stats_akcipher_verify(ret, calg); return ret; } -- 2.11.0