Hi all, On Mon, 30 Oct 2023 15:58:09 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> --- 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:
pgpTx3VGvG5vI.pgp
Description: OpenPGP digital signature