From: Eric Biggers <ebiggers@kernel.org>
To: Mikulas Patocka <mpatocka@redhat.com>
Cc: Mike Snitzer <msnitzer@redhat.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Zaibo Xu <xuzaibo@huawei.com>,
linux-kernel@vger.kernel.org, Wei Xu <xuwei5@hisilicon.com>,
dm-devel@redhat.com, George Cherian <gcherian@marvell.com>,
linux-crypto@vger.kernel.org,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
"David S. Miller" <davem@davemloft.net>,
Milan Broz <mbroz@redhat.com>
Subject: Re: [dm-devel] [PATCH 1/3 v4] crypto: introduce the flag CRYPTO_ALG_ALLOCATES_MEMORY
Date: Tue, 30 Jun 2020 09:35:52 -0700 [thread overview]
Message-ID: <20200630163552.GA837@sol.localdomain> (raw)
In-Reply-To: <alpine.LRH.2.02.2006300954150.15237@file01.intranet.prod.int.rdu2.redhat.com>
On Tue, Jun 30, 2020 at 09:56:22AM -0400, Mikulas Patocka wrote:
> Index: linux-2.6/crypto/cryptd.c
> ===================================================================
> --- linux-2.6.orig/crypto/cryptd.c 2020-06-29 16:03:07.346417000 +0200
> +++ linux-2.6/crypto/cryptd.c 2020-06-30 15:49:04.206417000 +0200
> @@ -202,6 +202,7 @@ static inline void cryptd_check_internal
>
> *type |= algt->type & CRYPTO_ALG_INTERNAL;
> *mask |= algt->mask & CRYPTO_ALG_INTERNAL;
> + *mask |= algt->mask & CRYPTO_ALG_INHERITED_FLAGS;
> }
This needs to use the correct logic (crypto_alg_inherited_mask) to decide which
inherited flags to set in 'mask'.
> --- linux-2.6.orig/crypto/adiantum.c 2020-06-29 16:03:07.346417000 +0200
> +++ linux-2.6/crypto/adiantum.c 2020-06-29 16:03:07.346417000 +0200
> @@ -507,7 +507,7 @@ static int adiantum_create(struct crypto
> if ((algt->type ^ CRYPTO_ALG_TYPE_SKCIPHER) & algt->mask)
> return -EINVAL;
>
> - mask = crypto_requires_sync(algt->type, algt->mask);
> + mask = crypto_alg_inherited_mask(algt->type, algt->mask);
>
> inst = kzalloc(sizeof(*inst) + sizeof(*ictx), GFP_KERNEL);
> if (!inst)
This is still missing setting the flags correctly on the template instance being
constructed. The flags need to be inherited from all "inner" algorithms:
inst->alg.base.cra_flags = (streamcipher_alg->base.cra_flags |
blockcipher_alg->cra_flags |
hash_alg->base.cra_flags) &
CRYPTO_ALG_INHERITED_FLAGS;
If we don't do that, the template instance may allocate memory but not have
CRYPTO_ALG_ALLOCATES_MEMORY set.
> Index: linux-2.6/crypto/pcrypt.c
> ===================================================================
> --- linux-2.6.orig/crypto/pcrypt.c 2020-06-29 16:03:07.346417000 +0200
> +++ linux-2.6/crypto/pcrypt.c 2020-06-30 15:47:32.776417000 +0200
> @@ -263,7 +263,9 @@ static int pcrypt_create_aead(struct cry
> if (err)
> goto err_free_inst;
>
> - inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC;
> + inst->alg.base.cra_flags =
> + CRYPTO_ALG_ASYNC |
> + (alg->base.cra_flags & CRYPTO_ALG_INHERITED_FLAGS);
>
> inst->alg.ivsize = crypto_aead_alg_ivsize(alg);
> inst->alg.maxauthsize = crypto_aead_alg_maxauthsize(alg);
And this is still missing setting the mask:
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 7240e8bbdebb..643f7f1cc91c 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -232,12 +232,15 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
struct crypto_attr_type *algt;
struct aead_instance *inst;
struct aead_alg *alg;
+ u32 mask;
int err;
algt = crypto_get_attr_type(tb);
if (IS_ERR(algt))
return PTR_ERR(algt);
+ mask = crypto_alg_inherited_mask(algt->type, algt->mask);
+
inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
if (!inst)
return -ENOMEM;
@@ -254,7 +257,7 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
goto err_free_inst;
err = crypto_grab_aead(&ctx->spawn, aead_crypto_instance(inst),
- crypto_attr_alg_name(tb[1]), 0, 0);
+ crypto_attr_alg_name(tb[1]), 0, mask);
if (err)
goto err_free_inst;
Can you please think logically about what you're trying to accomplish?
In particular, if someone requests an algorithm that doesn't allocate memory
(which is indicated by type=0, mask=CRYPTO_ALG_ALLOCATES_MEMORY), that request
needs to be honored.
- Eric
next prev parent reply other threads:[~2020-06-30 16:36 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 17:11 crypto API and GFP_ATOMIC Mikulas Patocka
2020-06-10 1:04 ` Herbert Xu
2020-06-10 12:02 ` Mikulas Patocka
2020-06-10 12:11 ` Herbert Xu
2020-06-16 15:01 ` Mikulas Patocka
2020-06-16 15:01 ` [PATCH 1/4] crypto: introduce CRYPTO_ALG_ALLOCATES_MEMORY Mikulas Patocka
2020-06-16 17:36 ` [dm-devel] " Eric Biggers
2020-06-17 15:08 ` Mikulas Patocka
2020-06-17 15:09 ` [PATCH 1/3] crypto: pass the flag CRYPTO_ALG_ALLOCATES_MEMORY Mikulas Patocka
2020-06-26 4:45 ` Herbert Xu
2020-06-26 15:17 ` Mikulas Patocka
2020-06-26 16:16 ` [PATCH 1/3 v2] crypto: introduce " Mikulas Patocka
2020-06-26 16:46 ` Eric Biggers
2020-06-26 17:00 ` [dm-devel] " Eric Biggers
2020-06-28 19:07 ` Mikulas Patocka
2020-06-28 19:50 ` Eric Biggers
2020-06-30 13:57 ` Mikulas Patocka
2020-06-28 20:00 ` Eric Biggers
2020-06-29 13:17 ` Mikulas Patocka
2020-06-30 13:45 ` Mikulas Patocka
2020-06-28 19:04 ` Mikulas Patocka
2020-06-28 19:46 ` Eric Biggers
2020-06-28 19:05 ` [PATCH 1/3 v3] " Mikulas Patocka
2020-06-30 13:56 ` [PATCH 1/3 v4] " Mikulas Patocka
2020-06-30 16:35 ` Eric Biggers [this message]
2020-06-30 17:01 ` [dm-devel] " Mikulas Patocka
2020-06-30 17:02 ` [PATCH 1/3 v5] " Mikulas Patocka
2020-06-30 17:57 ` [dm-devel] [PATCH 1/3 v4] " Eric Biggers
2020-06-30 18:14 ` Mikulas Patocka
2020-06-30 18:15 ` [PATCH 1/3 v6] " Mikulas Patocka
2020-07-01 1:49 ` Herbert Xu
2020-06-17 15:10 ` [PATCH 2/3] crypto: set " Mikulas Patocka
2020-06-17 15:11 ` [PATCH 3/3] dm-crypt: don't use drivers that have CRYPTO_ALG_ALLOCATES_MEMORY Mikulas Patocka
2020-06-16 15:01 ` [PATCH 2/4] crypto: pass the flag CRYPTO_ALG_ALLOCATES_MEMORY Mikulas Patocka
2020-06-16 17:42 ` [dm-devel] " Eric Biggers
2020-06-16 15:02 ` [PATCH 3/4] crypto: set " Mikulas Patocka
2020-06-16 17:43 ` [dm-devel] " Eric Biggers
2020-06-16 15:02 ` [PATCH 4/4] crypto: fix the drivers that don't respect CRYPTO_TFM_REQ_MAY_SLEEP Mikulas Patocka
2020-06-16 17:50 ` [dm-devel] " Eric Biggers
2020-06-16 18:18 ` Mikulas Patocka
2020-06-16 18:23 ` Eric Biggers
2020-06-17 13:46 ` Mikulas Patocka
2020-06-17 13:48 ` [PATCH 1/2] cpt-crypto: don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified Mikulas Patocka
2020-06-26 6:07 ` Herbert Xu
2020-06-17 13:49 ` [PATCH 2/2] hisilicon-crypto: " Mikulas Patocka
2020-06-17 14:11 ` [dm-devel] " Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200630163552.GA837@sol.localdomain \
--to=ebiggers@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=davem@davemloft.net \
--cc=dm-devel@redhat.com \
--cc=gcherian@marvell.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mbroz@redhat.com \
--cc=mpatocka@redhat.com \
--cc=msnitzer@redhat.com \
--cc=xuwei5@hisilicon.com \
--cc=xuzaibo@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).