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=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 A5E23C433E0 for ; Tue, 30 Jun 2020 17:01:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 832A620768 for ; Tue, 30 Jun 2020 17:01:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XTgMT5nK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389977AbgF3RBd (ORCPT ); Tue, 30 Jun 2020 13:01:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51898 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727850AbgF3RBd (ORCPT ); Tue, 30 Jun 2020 13:01:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593536491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ue0lKfPsI3R9N1p2C7vEcmqih1Km0svEJuVxreo4r8o=; b=XTgMT5nKnEYLIqQzasCw13PPzRZ0T0swQBQes0J6UG87zmZsjTrE5HPLWaSQHHtWDjWRSJ /hiBQ1AdTVPLpaBBO6ckrjkgyZ++oasD8Icu+zjBYkTXzVxHxDIcT6tt8gmp/ViP8s3Wle /GrMgeMgtkvfR2JNjrkweA8rRgdYg8o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-494-I8cA5QD5NQOsu7gKkxzNDQ-1; Tue, 30 Jun 2020 13:01:23 -0400 X-MC-Unique: I8cA5QD5NQOsu7gKkxzNDQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B9DB800C60; Tue, 30 Jun 2020 17:01:21 +0000 (UTC) Received: from file01.intranet.prod.int.rdu2.redhat.com (file01.intranet.prod.int.rdu2.redhat.com [10.11.5.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 034431036D11; Tue, 30 Jun 2020 17:01:17 +0000 (UTC) Received: from file01.intranet.prod.int.rdu2.redhat.com (localhost [127.0.0.1]) by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4) with ESMTP id 05UH1HNG002340; Tue, 30 Jun 2020 13:01:17 -0400 Received: from localhost (mpatocka@localhost) by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4/Submit) with ESMTP id 05UH1GeY002319; Tue, 30 Jun 2020 13:01:16 -0400 X-Authentication-Warning: file01.intranet.prod.int.rdu2.redhat.com: mpatocka owned process doing -bs Date: Tue, 30 Jun 2020 13:01:16 -0400 (EDT) From: Mikulas Patocka X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com To: Eric Biggers cc: Mike Snitzer , Herbert Xu , Zaibo Xu , linux-kernel@vger.kernel.org, Wei Xu , dm-devel@redhat.com, George Cherian , linux-crypto@vger.kernel.org, Jonathan Cameron , "David S. Miller" , Milan Broz Subject: Re: [dm-devel] [PATCH 1/3 v4] crypto: introduce the flag CRYPTO_ALG_ALLOCATES_MEMORY In-Reply-To: <20200630163552.GA837@sol.localdomain> Message-ID: References: <20200616173620.GA207319@gmail.com> <20200626044534.GA2870@gondor.apana.org.au> <20200626164617.GA211634@gmail.com> <20200630163552.GA837@sol.localdomain> User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Tue, 30 Jun 2020, Eric Biggers wrote: > 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'. I added "*mask |= crypto_alg_inherited_mask(algt->type, algt->mask);" there. > > --- 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. OK > > 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); What's wrong with this? > 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; > I added "mask" there - but there is still a "mask" argument that is unused - is it a bug to have two "mask" variables? > Can you please think logically about what you're trying to accomplish? I am not an expert in crypto code. > 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 Mikulas