diff options
| author | David S. Miller <davem@davemloft.net> | 2019-01-27 10:30:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-27 10:30:01 -0800 |
| commit | c303a9b297fab7ab874fed35f7fd5d9ab559edca (patch) | |
| tree | be4721ad4a99b17f360d04d421352aa2c1867196 /net/netrom | |
| parent | 1fc7f56db7a7c467e46a5d2e2a009d2f337e0338 (diff) | |
| parent | e2612cd496e7b465711d219ea6118893d7253f52 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2019-01-25
1) Several patches to fix the fallout from the recent
tree based policy lookup work. From Florian Westphal.
2) Fix VTI for IPCOMP for 'not compressed' IPCOMP packets.
We need an extra IPIP handler to process these packets
correctly. From Su Yanjun.
3) Fix validation of template and selector families for
MODE_ROUTEOPTIMIZATION with ipv4-in-ipv6 packets.
This can lead to a stack-out-of-bounds because
flowi4 struct is treated as flowi6 struct.
Fix from Florian Westphal.
4) Restore the default behaviour of the xfrm set-mark
in the output path. This was changed accidentally
when mark setting was extended to the input path.
From Benedict Wong.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom')
0 files changed, 0 insertions, 0 deletions