From 6e3871c893c2949dcf5ef10d91b5a7c6ec97e9d2 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 7 Jul 2026 10:06:28 -0400 Subject: [PATCH] MT#55283 further defuse error log If SRTP/DTLS isn't yet established, do fully bail out of the kernelize function, instead of just logging a message and blindly continuing, as it would eventually fail due to missing or invalid SRTP parameters. Fix-up for f2d57de078 Change-Id: I3521f54fe2001d3c67118a3502807d8cb6ada7ee (cherry picked from commit 7ab5cf3ebfef0e783adccb2ba29302f76370d8ed) --- daemon/media_socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/daemon/media_socket.c b/daemon/media_socket.c index db0657aa6..cafad4ca4 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -1632,7 +1632,7 @@ static const char *kernelize_target(kernelize_state *s, struct packet_stream *st int ret = handler->in->kernel(&reti->decrypt, stream); if (ret) { ilog(LOG_NOTICE, "Decryption SRTP not yet negotiated"); - return NULL; + return ""; } if (!reti->decrypt.cipher || !reti->decrypt.hmac) return "decryption cipher or HMAC not supported by kernel module"; @@ -1909,7 +1909,8 @@ static void kernelize(struct packet_stream *stream) { const char *err = kernelize_target(&s, stream); if (err) { - ilog(LOG_WARNING, "No support for kernel packet forwarding available (%s)", err); + if (*err) + ilog(LOG_WARNING, "No support for kernel packet forwarding available (%s)", err); goto no_kernel; }