summaryrefslogtreecommitdiff
path: root/staging/cli_udp.c
AgeCommit message (Expand)AuthorFilesLines
2013-05-13staging: add mausezahn staging directoryDaniel Borkmann1-0/+204
loft.net>2016-09-22 02:56:23 -0400 committerDavid S. Miller <davem@davemloft.net>2016-09-22 02:56:23 -0400 commitba1ba25d3159573ffdc9e79e5c3dfcf9c5742964 (patch) treec2572c4362e4ceaa7bfc6b2d6136d22026d37c40 parent290b774a1e0cb385658ba117452e2a2962323b1f (diff)parent63c43787d35e45562a6b5927e2edc8f4783d95b8 (diff)
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