From 4847c8ad104e218cf700cc94f24f3e5de732a334 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Fri, 10 Jul 2026 07:07:46 -0400 Subject: [PATCH] MT#55283 add extra null checks Don't just check for the selected_sfd to be non null, but also for the socket to actually be open, as this is needed for the translate_ep set of functions in particular. Change-Id: I78cb0f7b8c9e4359c9e037485b29f63e0cd9476b (cherry picked from commit 9cb902319c192143027e2956202a708b207350b8) --- daemon/media_socket.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/daemon/media_socket.c b/daemon/media_socket.c index d01eeb581..606e4a5ca 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -1571,9 +1571,13 @@ static const char *kernelize_target(kernelize_state *s, struct packet_stream *st if (s->blackhole) s->non_forwarding = true; + stream_fd *sfd = stream->selected_sfd; + if (!sfd || !sfd->socket.family) + return "socket not open"; + ilog(LOG_INFO, "Kernelizing media stream: remote %s%s%s -> local %s", FMT_M(endpoint_print_buf(&stream->endpoint)), - endpoint_print_buf(&stream->selected_sfd->socket.local)); + endpoint_print_buf(&sfd->socket.local)); // fill input __auto_type reti = &s->reti; @@ -1586,8 +1590,8 @@ static const char *kernelize_target(kernelize_state *s, struct packet_stream *st reti->src_mismatch = MSM_PROPAGATE; } - __re_address_translate_ep(&reti->local, &stream->selected_sfd->socket.local); - reti->iface_stats = stream->selected_sfd->local_intf->stats; + __re_address_translate_ep(&reti->local, &sfd->socket.local); + reti->iface_stats = sfd->local_intf->stats; reti->stats = stream->stats_in; reti->rtcp = PS_ISSET(stream, RTCP); reti->dtls = MEDIA_ISSET(media, DTLS); @@ -1764,7 +1768,7 @@ static const char *kernelize_one(kernelize_state *s, __auto_type reti = &s->reti; // any output at all? - if (s->non_forwarding || !sink->selected_sfd) + if (s->non_forwarding || !sink->selected_sfd || !sink->selected_sfd->socket.family) return NULL; // no output if (!PS_ISSET(sink, FILLED)) return NULL; @@ -1900,7 +1904,7 @@ static void kernelize(struct packet_stream *stream) { goto no_kernel_warn; if (MEDIA_ISSET(media, GENERATOR)) goto no_kernel; - if (!stream->selected_sfd) + if (!stream->selected_sfd || !stream->selected_sfd->socket.family) goto no_kernel; if (ML_ISSET(media->monologue, BLOCK_MEDIA) || CALL_ISSET(call, BLOCK_MEDIA)) goto no_kernel; @@ -2006,7 +2010,7 @@ struct ssrc_entry_call *__hunt_ssrc_ctx(uint32_t ssrc, struct ssrc_entry_call *l void __unkernelize(struct packet_stream *p, const char *reason) { bool no_supp = PS_CLEAR(p, NO_KERNEL_SUPPORT); - if (!p->selected_sfd) + if (!p->selected_sfd || !p->selected_sfd->socket.family) return; if (!PS_ISSET(p, KERNELIZED))