summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-05-23 17:51:32 +0300
committerDavid S. Miller <davem@davemloft.net>2017-05-23 17:51:32 +0300
commit2f9bfd3399920440edec724bee626b87070def4a (patch)
tree489613e42d327b3f52a8ee547b8fb1f05e639021 /include/linux
parentfadd2ce5a3680fb265694f573cbfb8bcb7d6c9d5 (diff)
parenta486cd23661c9387fb076c3f6ae8b2aa9d20d54a (diff)
downloadlinux-2f9bfd3399920440edec724bee626b87070def4a.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says: ==================== pull request (net): ipsec 2017-05-23 1) Fix wrong header offset for esp4 udpencap packets. 2) Fix a stack access out of bounds when creating a bundle with sub policies. From Sabrina Dubroca. 3) Fix slab-out-of-bounds in pfkey due to an incorrect sadb_x_sec_len calculation. 4) We checked the wrong feature flags when taking down an interface with IPsec offload enabled. Fix from Ilan Tayari. 5) Copy the anti replay sequence numbers when doing a state migration, otherwise we get out of sync with the sequence numbers. Fix from Antony Antony. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions