diff options
| author | David S. Miller <davem@davemloft.net> | 2022-07-20 10:11:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-07-20 10:11:58 +0100 |
| commit | ef5621758a02fe8178de9d0df414ffb79463ff86 (patch) | |
| tree | 46e8b31201f5a9e1cf2df02c52329173518409ca /net/xfrm | |
| parent | 48ea8ea32dbf3231882e9bc0b297fe1400785219 (diff) | |
| parent | e79b9473e9b59e83e23db9b7411c6080b5a6826d (diff) | |
| download | linux-ef5621758a02fe8178de9d0df414ffb79463ff86.tar.gz | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index f1876ea61fdce..f1a0bab920a55 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -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)++; |