From: Martin Willi <martin@revosec.ch>
Date: Wed, 11 Aug 2010 08:51:40 +0000 (+0200)
Subject: Discard a packet that exceeds the receive buffer
X-Git-Tag: 4.5.0~533
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aea735ef63b809d5c50e058f164cea362fe3893c;p=thirdparty%2Fstrongswan.git

Discard a packet that exceeds the receive buffer
---

diff --git a/src/libcharon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c
index c88206eeb6..4eeffff25b 100644
--- a/src/libcharon/plugins/socket_default/socket_default_socket.c
+++ b/src/libcharon/plugins/socket_default/socket_default_socket.c
@@ -212,6 +212,11 @@ METHOD(socket_t, receiver, status_t,
 			DBG1(DBG_NET, "error reading socket: %s", strerror(errno));
 			return FAILED;
 		}
+		if (msg.msg_flags & MSG_TRUNC)
+		{
+			DBG1(DBG_NET, "receive buffer too small, packet discarded");
+			return FAILED;
+		}
 		DBG3(DBG_NET, "received packet %b", buffer, bytes_read);
 
 		if (bytes_read < MARKER_LEN)
diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
index 42921d6d9f..35fbb3afd7 100644
--- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
+++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
@@ -229,6 +229,11 @@ static packet_t *receive_packet(private_socket_dynamic_socket_t *this,
 		DBG1(DBG_NET, "error reading socket: %s", strerror(errno));
 		return NULL;
 	}
+	if (msg.msg_flags & MSG_TRUNC)
+	{
+		DBG1(DBG_NET, "receive buffer too small, packet discarded");
+		return NULL;
+	}
 	DBG3(DBG_NET, "received packet %b", buffer, len);
 
 	if (len < MARKER_LEN)
diff --git a/src/libcharon/plugins/socket_raw/socket_raw_socket.c b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
index 604a9d977a..6cbab846b3 100644
--- a/src/libcharon/plugins/socket_raw/socket_raw_socket.c
+++ b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
@@ -172,6 +172,11 @@ METHOD(socket_t, receiver, status_t,
 			DBG1(DBG_NET, "error reading from IPv4 socket: %s", strerror(errno));
 			return FAILED;
 		}
+		if (bytes_read == this->max_packet)
+		{
+			DBG1(DBG_NET, "receive buffer too small, packet discarded");
+			return FAILED;
+		}
 		DBG3(DBG_NET, "received IPv4 packet %b", buffer, bytes_read);
 
 		/* read source/dest from raw IP/UDP header */