Commit ef562175 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 



Steffen Klassert says:

====================
pull request (net): ipsec 2022-07-20

1) Fix a policy refcount imbalance in xfrm_bundle_lookup.
   From Hangyu Hua.

2) Fix some clang -Wformat warnings.
   Justin Stitt
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 48ea8ea3 e79b9473

net/ipv4/ah4.c

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


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

	    crypto_ahash_digestsize(ahash)) {

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

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

			__func__, x->aalg->alg_name,

			crypto_ahash_digestsize(ahash),

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

net/ipv4/esp4.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,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/xfrm/xfrm_policy.c

+4 −1
Original line number Diff line number Diff line
@@ -2678,8 +2678,10 @@ static int xfrm_expand_policies(const struct flowi *fl, u16 family, 
		*num_xfrms = 0;

		return 0;

	}

	if (IS_ERR(pols[0]))

	if (IS_ERR(pols[0])) {

		*num_pols = 0;

		return PTR_ERR(pols[0]);

	}



	*num_xfrms = pols[0]->xfrm_nr;
@@ -2694,6 +2696,7 @@ static int xfrm_expand_policies(const struct flowi *fl, u16 family, 
		if (pols[1]) {

			if (IS_ERR(pols[1])) {

				xfrm_pols_put(pols, *num_pols);

				*num_pols = 0;

				return PTR_ERR(pols[1]);

			}

			(*num_pols)++;