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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 979ECC2D0C8 for ; Sun, 29 Dec 2019 02:58:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A7A7206F4 for ; Sun, 29 Dec 2019 02:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577588295; bh=gTbhIl5PjfxmdhlHHYKAnBJNIRB/c/J3X2CVX7xElY4=; h=From:To:Subject:Date:In-Reply-To:References:List-ID:From; b=rTq29G7dLz6hKXa5OCfFFmODoDlV2xuH7bl5KJk18jaJbqbMxOsF31Od2/WThtBqW NvBxuFGpxb96LM11i2D2d+rc5uG1I4UbU3EgetI0a+59UUTz+Byz1gsW7npFtsFtre Kl/LYXDAcBz6VC1wBgXxJkUQPaH693BO5ZH3AV9s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726460AbfL2C6O (ORCPT ); Sat, 28 Dec 2019 21:58:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:44462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726490AbfL2C6N (ORCPT ); Sat, 28 Dec 2019 21:58:13 -0500 Received: from zzz.tds (h75-100-12-111.burkwi.broadband.dynamic.tds.net [75.100.12.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2873921775 for ; Sun, 29 Dec 2019 02:58:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577588292; bh=gTbhIl5PjfxmdhlHHYKAnBJNIRB/c/J3X2CVX7xElY4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=0xDc36CzsJxQL8o67rYzJLLGq29NGiNfm3oU5TYRq2kMQx5Bbw/JxxI4H9v6VywiR lrL1eTo3fRK6FICGJr+2KtVGmbz6T33uyfkyBt8RAaFGrlWdALJ438587urXTIK0j1 5bZTgbq9Iawm5NnXLUBOxT4ifuOKu13I8KlHdYo0= From: Eric Biggers To: linux-crypto@vger.kernel.org Subject: [PATCH 23/28] crypto: vmac - use crypto_grab_cipher() and simplify error paths Date: Sat, 28 Dec 2019 20:57:09 -0600 Message-Id: <20191229025714.544159-24-ebiggers@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229025714.544159-1-ebiggers@kernel.org> References: <20191229025714.544159-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org From: Eric Biggers Make the vmac64 template use the new function crypto_grab_cipher() to initialize its cipher spawn. This is needed to make all spawns be initialized in a consistent way. This required making vmac_create() allocate the instance directly rather than use shash_alloc_instance(). Also simplify the error handling by taking advantage of crypto_drop_*() now accepting (as a no-op) spawns that haven't been initialized yet, and by taking advantage of crypto_grab_*() now handling ERR_PTR() names. Signed-off-by: Eric Biggers --- crypto/vmac.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/crypto/vmac.c b/crypto/vmac.c index f50a85060b39..73538224f9ab 100644 --- a/crypto/vmac.c +++ b/crypto/vmac.c @@ -620,6 +620,7 @@ static void vmac_exit_tfm(struct crypto_tfm *tfm) static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb) { struct shash_instance *inst; + struct crypto_cipher_spawn *spawn; struct crypto_alg *alg; int err; @@ -627,25 +628,24 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb) if (err) return err; - alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, - CRYPTO_ALG_TYPE_MASK); - if (IS_ERR(alg)) - return PTR_ERR(alg); + inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL); + if (!inst) + return -ENOMEM; + spawn = shash_instance_ctx(inst); + + err = crypto_grab_cipher(spawn, shash_crypto_instance(inst), + crypto_attr_alg_name(tb[1]), 0, 0); + if (err) + goto out; + alg = crypto_spawn_cipher_alg(spawn); err = -EINVAL; if (alg->cra_blocksize != VMAC_NONCEBYTES) - goto out_put_alg; - - inst = shash_alloc_instance(tmpl->name, alg); - err = PTR_ERR(inst); - if (IS_ERR(inst)) - goto out_put_alg; + goto out; - err = crypto_init_spawn(shash_instance_ctx(inst), alg, - shash_crypto_instance(inst), - CRYPTO_ALG_TYPE_MASK); + err = crypto_inst_setname(shash_crypto_instance(inst), tmpl->name, alg); if (err) - goto out_free_inst; + goto out; inst->alg.base.cra_priority = alg->cra_priority; inst->alg.base.cra_blocksize = alg->cra_blocksize; @@ -663,13 +663,9 @@ static int vmac_create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.setkey = vmac_setkey; err = shash_register_instance(tmpl, inst); - if (err) { -out_free_inst: +out: + if (err) shash_free_instance(shash_crypto_instance(inst)); - } - -out_put_alg: - crypto_mod_put(alg); return err; } -- 2.24.1