diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-23 21:56:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-23 21:56:36 -0700 |
| commit | 11f1fb3459d7b0b36c887dbd930e462f1e011d4d (patch) | |
| tree | 4e9879e010a26c7a2ee7f3a3f35647885aa3b4e0 /net/xfrm/xfrm_policy.c | |
| parent | dd1d3f8f9920926aa426589e542eed6bf58b7354 (diff) | |
| parent | a0e5ef53aac8e5049f9344857d8ec5237d31e58b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2014-07-23
Just two fixes this time, both are stable candidates.
1) Fix the dst_entry refcount on socket policy usage.
2) Fix a wrong SPI check that prevents AH SAs from getting
installed, dependent on the SPI. From Tobias Brunner.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index a8ef5108e0d8..0525d78ba328 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -2097,6 +2097,8 @@ struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig, goto no_transform; } + dst_hold(&xdst->u.dst); + xdst->u.dst.flags |= DST_NOCACHE; route = xdst->route; } } |