diff options
| author | author Timo Teräs timo.teras@iki.fi 1442826138 +0300 <author Timo Teräs timo.teras@iki.fi 1442826138 +0300> | 2015-09-21 12:02:18 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-09-21 14:22:41 +0300 |
| commit | bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee (patch) | |
| tree | 1b554c92454930300c19e392352193cdd683c208 /main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch | |
| parent | 79d8c05b7c382123dd04bd4dfb7ed7472d87c5d7 (diff) | |
| download | aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.bz2 aports-bffeca85f0d7cf485aeabb17dd0d40735fe2b2ee.tar.xz | |
main/strongswan: upgrade to 5.3.3
remove upstreamed patches; rebase the rest
Diffstat (limited to 'main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch')
| -rw-r--r-- | main/strongswan/0101-kernel-netlink-Actually-verify-if-the-netlink-messag.patch | 31 |
1 files changed, 0 insertions, 31 deletions
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 <tobias@strongswan.org> -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 - |