From 845b4272e3741815fccb2418560dd6f2094d37f8 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 25 Oct 2021 11:48:26 -0400 Subject: [PATCH] TT#14008 extra mitigation for forwarding loops Flag a socket with an error strike when packets are received too fast, and refuse processing once too many strikes have occurred. This should prevent forwarding loops from taking down the system. Change-Id: Idc574f2f1dbbcb156efc37a80e903dc4e60ef1b1 --- daemon/media_socket.c | 30 ++++++++++++++++++++++++------ include/media_socket.h | 1 + 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 2d0e14dbe..39899ca2f 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -39,6 +39,10 @@ #define MAX_RECV_ITERS 50 #endif +#ifndef MAX_RECV_LOOP_STRIKES +#define MAX_RECV_LOOP_STRIKES 5 +#endif + struct intf_rr { @@ -1991,16 +1995,26 @@ static void stream_fd_readable(int fd, void *p, uintptr_t u) { struct call *ca; if (sfd->socket.fd != fd) - goto out; + return; log_info_stream_fd(sfd); + int strikes = g_atomic_int_get(&sfd->error_strikes); + + if (strikes >= MAX_RECV_LOOP_STRIKES) { + ilog(LOG_ERROR | LOG_FLAG_LIMIT, "UDP receive queue exceeded %i times: " + "discarding packet", strikes); + // Polling is edge-triggered so we won't immediately get here again. + // We could remove ourselves from the poller though. Maybe call stream_fd_closed? + return; + } for (iters = 0; ; iters++) { #if MAX_RECV_ITERS if (iters >= MAX_RECV_ITERS) { - ilog(LOG_ERROR, "Too many packets in UDP receive queue (more than %d), " + ilog(LOG_ERROR | LOG_FLAG_LIMIT, "Too many packets in UDP receive queue (more than %d), " "aborting loop. Dropped packets possible", iters); - break; + g_atomic_int_inc(&sfd->error_strikes); + goto strike; } #endif @@ -2020,7 +2034,7 @@ static void stream_fd_readable(int fd, void *p, uintptr_t u) { goto done; } if (ret >= MAX_RTP_PACKET_SIZE) - ilog(LOG_WARNING, "UDP packet possibly truncated"); + ilog(LOG_WARNING | LOG_FLAG_LIMIT, "UDP packet possibly truncated"); str_init_len(&phc.s, buf + RTP_BUFFER_HEAD_ROOM, ret); @@ -2033,12 +2047,16 @@ static void stream_fd_readable(int fd, void *p, uintptr_t u) { ret = stream_packet(&phc); if (G_UNLIKELY(ret < 0)) - ilog(LOG_WARNING, "Write error on media socket: %s", strerror(-ret)); + ilog(LOG_WARNING | LOG_FLAG_LIMIT, "Write error on media socket: %s", strerror(-ret)); else if (phc.update) update = 1; } -out: + // no strike + if (strikes > 0) + g_atomic_int_compare_and_exchange(&sfd->error_strikes, strikes, strikes - 1); + +strike: ca = sfd->call ? : NULL; if (ca && update) { diff --git a/include/media_socket.h b/include/media_socket.h index 19b5c3a58..ea867a70b 100644 --- a/include/media_socket.h +++ b/include/media_socket.h @@ -121,6 +121,7 @@ struct stream_fd { struct packet_stream *stream; /* LOCK: call->master_lock */ struct crypto_context crypto; /* IN direction, LOCK: stream->in_lock */ struct dtls_connection dtls; /* LOCK: stream->in_lock */ + int error_strikes; }; struct media_packet { str raw;