From bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?author=20Timo=20Ter=C3=A4s=20timo=2Eteras=40iki=2Efi=20144?= =?UTF-8?q?2826138=20+0300?= Date: Mon, 21 Sep 2015 12:02:18 +0300 Subject: main/strongswan: upgrade to 5.3.3 remove upstreamed patches; rebase the rest --- ...ink-Actually-verify-if-the-netlink-messag.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch (limited to 'main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch') diff --git a/main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch b/main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch deleted file mode 100644 index 945f1da2b0..0000000000 --- a/main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e0e3b6d92b37ba6633a9cd7f0ed2bd3ce56fdcc0 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner -Date: Thu, 16 Jul 2015 11:43:44 +0200 -Subject: [PATCH] kernel-netlink: Actually verify if the netlink message - exceeds the buffer size - -It might equal it and that's fine. With MSG_TRUNC we get the actual -message size and can only report an error if we haven't received the -complete message. ---- - src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c -index b0e3103..809d0f4 100644 ---- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c -+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c -@@ -185,8 +185,8 @@ static ssize_t read_msg(private_netlink_socket_t *this, - return -1; - } - } -- len = recv(this->socket, buf, buflen, block ? 0 : MSG_DONTWAIT); -- if (len == buflen) -+ len = recv(this->socket, buf, buflen, (block ? 0 : MSG_DONTWAIT)|MSG_TRUNC); -+ if (len > buflen) - { - DBG1(DBG_KNL, "netlink response exceeds buffer size"); - return 0; --- -2.4.6 - -- cgit v1.2.3