Commit 8c1186be authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next 



Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2021-04-14

Not much this time:

1) Simplification of some variable calculations in esp4 and esp6.
   From Jiapeng Chong and Junlin Yang.

2) Fix a clang Wformat warning in esp6 and ah6.
   From Arnd Bergmann.

Please pull or let me know if there are problems.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 216f78ea 6ad2dd6c

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ int esp_input_done2(struct sk_buff *skb, int err) 
	int hlen = sizeof(struct ip_esp_hdr) + crypto_aead_ivsize(aead);

	int ihl;



	if (!xo || (xo && !(xo->flags & CRYPTO_DONE)))

	if (!xo || !(xo->flags & CRYPTO_DONE))

		kfree(ESP_SKB_CB(skb)->tmp);



	if (unlikely(err))

net/ipv6/ah6.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static int ah6_init_state(struct xfrm_state *x) 


	if (aalg_desc->uinfo.auth.icv_fullbits/8 !=

	    crypto_ahash_digestsize(ahash)) {

		pr_info("AH: %s digestsize %u != %hu\n",

		pr_info("AH: %s digestsize %u != %u\n",

			x->aalg->alg_name, crypto_ahash_digestsize(ahash),

			aalg_desc->uinfo.auth.icv_fullbits/8);

		goto error;

net/ipv6/esp6.c

+1 −1
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ static int esp_init_authenc(struct xfrm_state *x) 
		err = -EINVAL;

		if (aalg_desc->uinfo.auth.icv_fullbits / 8 !=

		    crypto_aead_authsize(aead)) {

			pr_info("ESP: %s digestsize %u != %hu\n",

			pr_info("ESP: %s digestsize %u != %u\n",

				x->aalg->alg_name,

				crypto_aead_authsize(aead),

				aalg_desc->uinfo.auth.icv_fullbits / 8);

net/ipv6/esp6_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int esp6_xmit(struct xfrm_state *x, struct sk_buff *skb, netdev_features 
	esp.plen = esp.clen - skb->len - esp.tfclen;

	esp.tailen = esp.tfclen + esp.plen + alen;



	if (!hw_offload || (hw_offload && !skb_is_gso(skb))) {

	if (!hw_offload || !skb_is_gso(skb)) {

		esp.nfrags = esp6_output_head(x, skb, &esp);

		if (esp.nfrags < 0)

			return esp.nfrags;