From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>,
Linux Crypto List <linux-crypto@vger.kernel.org>,
Dmitry Safonov <0x7f454c46@gmail.com>,
Dmitry Safonov <dima@arista.com>,
Francesco Ruggeri <fruggeri@arista.com>,
Salam Noureddine <noureddine@arista.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the crypto tree
Date: Mon, 30 Oct 2023 16:09:53 +1100 [thread overview]
Message-ID: <20231030160953.28f2df61@canb.auug.org.au> (raw)
In-Reply-To: <20231030155809.6b47288c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2019 bytes --]
Hi all,
On Mon, 30 Oct 2023 15:58:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the crypto tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> net/ipv4/tcp_ao.c: In function 'tcp_ao_key_alloc':
> net/ipv4/tcp_ao.c:1536:13: error: implicit declaration of function 'crypto_ahash_alignmask'; did you mean 'crypto_ahash_alg_name'? [-Werror=implicit-function-declaration]
> 1536 | if (crypto_ahash_alignmask(tfm) > TCP_AO_KEY_ALIGN) {
> | ^~~~~~~~~~~~~~~~~~~~~~
> | crypto_ahash_alg_name
>
> Caused by commit
>
> 0f8660c82b79 ("crypto: ahash - remove crypto_ahash_alignmask")
>
> interacting with commit
>
> 4954f17ddefc ("net/tcp: Introduce TCP_AO setsockopt()s")
>
> from the net-next tree.
>
> I have applied the following merge resolution patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Oct 2023 15:54:37 +1100
Subject: [PATCH] fix up for "crypto: ahash - remove crypto_ahash_alignmask"
interacting with "net/tcp: Introduce TCP_AO setsockopt()s"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/ipv4/tcp_ao.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c
index 6a845e906a1d..ef5472ed6158 100644
--- a/net/ipv4/tcp_ao.c
+++ b/net/ipv4/tcp_ao.c
@@ -1533,10 +1533,6 @@ static struct tcp_ao_key *tcp_ao_key_alloc(struct sock *sk,
goto err_free_pool;
tfm = crypto_ahash_reqtfm(hp.req);
- if (crypto_ahash_alignmask(tfm) > TCP_AO_KEY_ALIGN) {
- err = -EOPNOTSUPP;
- goto err_pool_end;
- }
digest_size = crypto_ahash_digestsize(tfm);
tcp_sigpool_end(&hp);
@@ -1551,8 +1547,6 @@ static struct tcp_ao_key *tcp_ao_key_alloc(struct sock *sk,
key->digest_size = digest_size;
return key;
-err_pool_end:
- tcp_sigpool_end(&hp);
err_free_pool:
tcp_sigpool_release(pool_id);
return ERR_PTR(err);
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-10-30 5:09 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-30 4:58 linux-next: build failure after merge of the crypto tree Stephen Rothwell
2023-10-30 5:09 ` Stephen Rothwell [this message]
2023-10-30 5:23 ` Herbert Xu
2023-10-30 17:44 ` Dmitry Safonov
2023-10-30 22:02 ` Jakub Kicinski
2023-10-31 4:51 ` Eric Biggers
2023-10-31 20:14 ` Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2024-03-13 0:57 Stephen Rothwell
2024-03-13 1:43 ` Herbert Xu
2024-03-13 1:45 ` Herbert Xu
2024-03-13 1:58 ` Barry Song
2024-03-13 2:01 ` Eric Biggers
2024-03-13 2:04 ` Herbert Xu
2024-03-13 2:29 ` Eric Biggers
2024-03-13 2:36 ` Herbert Xu
2024-03-13 2:12 ` Barry Song
2024-03-13 2:22 ` Eric Biggers
2023-06-26 2:39 Stephen Rothwell
2023-06-26 10:20 ` Herbert Xu
2023-05-22 0:52 Stephen Rothwell
2023-05-22 5:15 ` Herbert Xu
2023-05-23 0:36 ` Stephen Rothwell
2023-04-11 0:48 Stephen Rothwell
2023-04-11 2:22 ` Herbert Xu
2023-01-17 3:47 Stephen Rothwell
2023-01-16 0:29 Stephen Rothwell
2022-12-04 23:48 Stephen Rothwell
2022-12-04 23:52 ` Stephen Rothwell
2022-09-07 1:53 Stephen Rothwell
2022-09-06 1:30 Stephen Rothwell
2022-05-09 11:10 Stephen Rothwell
2022-05-09 12:26 ` Masahiro Yamada
2021-09-27 4:32 Stephen Rothwell
2020-04-21 5:12 Stephen Rothwell
2020-04-22 13:33 ` Herbert Xu
2020-04-17 3:40 Stephen Rothwell
2020-04-17 4:00 ` Shukun Tan
2019-08-12 3:21 Stephen Rothwell
2019-08-12 6:53 ` Zhou Wang
2019-08-05 4:57 Stephen Rothwell
2019-08-05 5:37 ` Chuhong Yuan
2019-08-08 1:52 ` Stephen Rothwell
2019-08-08 3:01 ` Herbert Xu
2019-08-08 3:17 ` Stephen Rothwell
2019-08-08 5:00 ` Herbert Xu
2019-08-08 5:04 ` Stephen Rothwell
2018-10-08 1:03 Stephen Rothwell
2018-10-08 5:54 ` Herbert Xu
2018-05-29 9:08 Stephen Rothwell
2018-05-29 10:16 ` Ondrej Mosnáček
2018-05-29 10:22 ` Stephen Rothwell
2017-11-06 0:25 Stephen Rothwell
2017-11-06 5:40 ` Herbert Xu
2016-11-29 0:55 Stephen Rothwell
2016-11-29 7:08 ` Herbert Xu
2016-11-29 8:34 ` Horia Geantă
2016-11-29 8:43 ` Herbert Xu
2016-07-20 7:46 Stephen Rothwell
2016-07-20 14:32 ` Herbert Xu
2016-06-24 6:20 Stephen Rothwell
2016-06-24 13:33 ` Herbert Xu
2016-06-24 13:36 ` Benedetto, Salvatore
2016-02-17 1:26 Stephen Rothwell
2015-10-15 1:37 Stephen Rothwell
2015-10-15 2:01 ` Herbert Xu
2015-08-05 6:49 Stephen Rothwell
2015-08-05 7:28 ` Herbert Xu
2015-06-20 6:35 Stephen Rothwell
2015-05-28 11:40 Stephen Rothwell
2015-05-28 13:08 ` Stephan Mueller
2015-03-17 2:01 Stephen Rothwell
2015-03-17 11:11 ` Herbert Xu
2014-07-24 3:08 Stephen Rothwell
2014-07-24 7:04 ` Randy Dunlap
2014-07-24 13:37 ` Tom Lendacky
2014-06-23 1:49 Stephen Rothwell
2014-06-23 12:27 ` Herbert Xu
2014-06-23 13:15 ` Stephen Rothwell
2014-06-23 13:40 ` Herbert Xu
2013-12-06 0:45 Stephen Rothwell
2013-05-21 1:45 Stephen Rothwell
2013-05-24 9:57 ` Herbert Xu
2013-05-27 2:19 ` Herbert Xu
2013-05-27 3:43 ` Stephen Rothwell
2013-05-27 3:44 ` Herbert Xu
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=20231030160953.28f2df61@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=0x7f454c46@gmail.com \
--cc=davem@davemloft.net \
--cc=dima@arista.com \
--cc=fruggeri@arista.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=noureddine@arista.com \
--cc=pabeni@redhat.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).