diff options
author | David S. Miller <davem@davemloft.net> | 2020-08-01 03:10:53 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-08-01 03:10:53 +0300 |
commit | 8d46215a1ff37b83e80e573563066548fc82084d (patch) | |
tree | 7b94ac7a2938bcf7155d0dd70a7c9cedf0ab234c /include/net/netns | |
parent | e535d87d8b4f85fe1659aa38c8fb75226b56eec5 (diff) | |
parent | 71b59bf482b2dd662774f34108c5b904efa9e02b (diff) | |
download | linux-8d46215a1ff37b83e80e573563066548fc82084d.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2020-07-31
1) Fix policy matching with mark and mask on userspace interfaces.
From Xin Long.
2) Several fixes for the new ESP in TCP encapsulation.
From Sabrina Dubroca.
3) Fix crash when the hold queue is used. The assumption that
xdst->path and dst->child are not a NULL pointer only if dst->xfrm
is not a NULL pointer is true with the exception of using the
hold queue. Fix this by checking for hold queue usage before
dereferencing xdst->path or dst->child.
4) Validate pfkey_dump parameter before sending them.
From Mark Salyzyn.
5) Fix the location of the transport header with ESP in UDPv6
encapsulation. From Sabrina Dubroca.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netns')
0 files changed, 0 insertions, 0 deletions