diff options
| author | David S. Miller | 2016-09-22 08:56:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-09-22 08:56:23 +0200 |
| commit | ba1ba25d3159573ffdc9e79e5c3dfcf9c5742964 (patch) | |
| tree | c2572c4362e4ceaa7bfc6b2d6136d22026d37c40 /net/ipv4/tcp_output.c | |
| parent | Merge tag 'linux-can-fixes-for-4.8-20160921' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | vti6: fix input path (diff) | |
| download | kernel-qcow2-linux-ba1ba25d3159573ffdc9e79e5c3dfcf9c5742964.tar.gz kernel-qcow2-linux-ba1ba25d3159573ffdc9e79e5c3dfcf9c5742964.tar.xz kernel-qcow2-linux-ba1ba25d3159573ffdc9e79e5c3dfcf9c5742964.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2016-09-21
1) Propagate errors on security context allocation.
From Mathias Krause.
2) Fix inbound policy checks for inter address family tunnels.
From Thomas Zeitlhofer.
3) Fix an old memory leak on aead algorithm usage.
From Ilan Tayari.
4) A recent patch fixed a possible NULL pointer dereference
but broke the vti6 input path.
Fix from Nicolas Dichtel.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
0 files changed, 0 insertions, 0 deletions