stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Jan Beulich <jbeulich@suse.com>,
	Herbert Xu <herbert@gondor.apana.org.au>
Subject: [PATCH 5.10 3/3] crypto: api - Move cryptomgr soft dependency into algapi
Date: Wed,  9 Feb 2022 20:14:21 +0100	[thread overview]
Message-ID: <20220209191249.005811880@linuxfoundation.org> (raw)
In-Reply-To: <20220209191248.892853405@linuxfoundation.org>

From: Herbert Xu <herbert@gondor.apana.org.au>

commit c6ce9c5831cae515d375a01b97ae1778689acf19 upstream.

The soft dependency on cryptomgr is only needed in algapi because
if algapi isn't present then no algorithms can be loaded.  This
also fixes the case where api is built-in but algapi is built as
a module as the soft dependency would otherwise get lost.

Fixes: 8ab23d547f65 ("crypto: api - Add softdep on cryptomgr")
Reported-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 crypto/algapi.c |    1 +
 crypto/api.c    |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -1295,3 +1295,4 @@ module_exit(crypto_algapi_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Cryptographic algorithms API");
+MODULE_SOFTDEP("pre: cryptomgr");
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -603,4 +603,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done);
 
 MODULE_DESCRIPTION("Cryptographic core API");
 MODULE_LICENSE("GPL");
-MODULE_SOFTDEP("pre: cryptomgr");



  parent reply	other threads:[~2022-02-09 19:16 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-09 19:14 [PATCH 5.10 0/3] 5.10.100-rc1 review Greg Kroah-Hartman
2022-02-09 19:14 ` [PATCH 5.10 1/3] moxart: fix potential use-after-free on remove path Greg Kroah-Hartman
2022-02-09 19:14 ` [PATCH 5.10 2/3] KVM: s390: Return error on SIDA memop on normal guest Greg Kroah-Hartman
2022-02-09 19:14 ` Greg Kroah-Hartman [this message]
2022-02-09 21:30 ` [PATCH 5.10 0/3] 5.10.100-rc1 review Pavel Machek
2022-02-10  0:58 ` Shuah Khan
2022-02-10  8:33 ` Jon Hunter
2022-02-10 12:44 ` Naresh Kamboju
2022-02-10 16:02 ` Sudip Mukherjee
2022-02-10 17:37 ` Florian Fainelli
2022-02-10 21:01 ` Guenter Roeck
2022-02-11  1:01 ` Samuel Zou
2022-02-11  6:11 ` Slade Watkins

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=20220209191249.005811880@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=jbeulich@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /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).