From patchwork Mon Oct 30 04:58:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13439974 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E51D19B for ; Mon, 30 Oct 2023 04:58:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="EHFlLPOJ" Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB861BC; Sun, 29 Oct 2023 21:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698641891; bh=xAnfqE6UvaOpcjQUHnh8QC3ca91/EV9KNTkMgLrAa6A=; h=Date:From:To:Cc:Subject:From; b=EHFlLPOJ8h10vplzw9JC+d3UZAxyJP3VRdIxS/gFl6PmLHGvd9B6UpCaX3X4kLDhC bnJ6N0AW94FkiRE9gVtZhWzdFKJ/fn5a3GPgmCz5X+HD8qlImMhsitAGiYYyAHPnaA 4EX9wrIKsrPEhDDFfKk7kW3WDjt0Wbwy4kOE1SoUjQ1ytVYprH4ax1u3gZ/Ek23B3w mN+ecSii3Uqtd/HgHFsChQVGByHPfo7RYbtkoK/TMLZMj/zOXZfNoQI/vbNR9FqYah 4a8fy/Pvxov7brAeS4DEbaObK5dgaSCA76k8XWaSxxlOgqtok742KEuUFjEetPdPvq M1W0UgGpqXiUg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SJgyB0FRLz4xPc; Mon, 30 Oct 2023 15:58:09 +1100 (AEDT) Date: Mon, 30 Oct 2023 15:58:09 +1100 From: Stephen Rothwell To: Herbert Xu , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Linux Crypto List , Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Francesco Ruggeri , Salam Noureddine , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the crypto tree Message-ID: <20231030155809.6b47288c@canb.auug.org.au> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Hi all, 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 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 Signed-off-by: Stephen Rothwell Acked-by: Herbert Xu Reviewed-by: Dmitry Safonov --- net/ipv4/tcp_ao.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c index 6a845e906a1d..d18562bb3184 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);