From nobody Tue Jun 30 17:21:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gqVLG6lFdz6jYRV for ; Tue, 30 Jun 2026 17:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqVLG1SMcz3rfZ for ; Tue, 30 Jun 2026 17:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PRbhUQIlxFvcbWlyHbP9iw91OjCL1lJ2vkVgP06P5oE=; b=Y3xkxykxsy+cjrOtRvi0/OMrI+ChWsj0atH4Edv3n1onYSnkVBpDWdocn5ma14A5+4O70B PyuMnQGBnetJAsIU1CcPBxaptAjXZeTQUHUwn3UVe5sBrUhUJNrBfwVMFzyaLb5JTSIeCG idiunYgGJlzFXqvQWf/Fk91Z8qy3ebkpJCxhMxaypakVxX9sBTCHhe+are7ODIOEQehBfL EocM0geDxzcWle//bFdIqq9/gJM69hF88PxMRHISfQ379T3rHW7Fwhvcf9UWIcuIpT3Wjz F3hgNQCqfzQ3eb+qxs+5Eo4QQkpYOXqTrtsB2WwqO5kW8W99i/O2zafvGr8oKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782840086; a=rsa-sha256; cv=none; b=sF3u2UK9DpcGg/+eNlE3I8XcpK4pSaj+sWk0ZfwElm6d0jOQxeRHBHynt1KBFV6cjdKSi/ feiL5IiVEOCtm7MQZoKXmlXuXDoAKd64/S00391ww9Y6bv88Sm99gdCnaGxnSdTmMESFKR lOuTz5wA/eptUWztGO6tBufHamkEeo6hZO1NbfxlJpj+ZxYuUSxNhRA7pBAsexQQDTI6zN X2VnDfXEAP+bvw26fyKAemZheM8ygpoHTjb3QedF4MoHPsLwEctt6n99UQsGDOiLy6dg6l JRSwPaaSUmJenCcpQhU48QLZNp6uNfPh5rsVkAm9niROsekDvU9EUIyHO0yWBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782840086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PRbhUQIlxFvcbWlyHbP9iw91OjCL1lJ2vkVgP06P5oE=; b=LGooNGhBMiOApUiKdgoMRYr9cJn9DoreoTvYr2Z8zWR3VdDCwGgDkhv2447kMaFVm5mkwi 7CNkalsHo0oODv6yAcZgmlvPOGpkfOgnM3k+e45xp1HOLKkXfJXmkHY0oMVUaM0O59hfCx WpNoYuqTh2W357Qtqe/UDMD2zJzolkPySHqFnyXqYmidPTaM54Gm+dWfir0HABow+HHXKW P9+ymLNutE7A3YtJCm5cnZQkR6OL2v3lS96E1Q83QiyP2rGcTDTHU4wpWG3sFahBlxUKu6 t0XQQNTlsrZTk7ifDcVtH7Fcm0rsFJglx+G25oqb1W3C5dzFj2SjOE0OePqwpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqVLG0YF7ztPw for ; Tue, 30 Jun 2026 17:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45e91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 17:21:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 64ce87df6876 - releng/15.0 - tests/libalias: Add a regression test for an alias_smedia bug List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 64ce87df6876219fc71afc53c9a3b0a2d2225c5d Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 17:21:26 +0000 Message-Id: <6a43fb16.45e91.2a0d6b0a@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=64ce87df6876219fc71afc53c9a3b0a2d2225c5d commit 64ce87df6876219fc71afc53c9a3b0a2d2225c5d Author: Mark Johnston AuthorDate: 2026-06-22 17:25:56 +0000 Commit: Mark Johnston CommitDate: 2026-06-30 02:32:57 +0000 tests/libalias: Add a regression test for an alias_smedia bug Approved by: so Security: FreeBSD-SA-26:41.libalias Security: CVE-2026-49420 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57747 --- tests/sys/netinet/libalias/Makefile | 4 ++ tests/sys/netinet/libalias/smedia.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/tests/sys/netinet/libalias/Makefile b/tests/sys/netinet/libalias/Makefile index 43bef996fae7..95816444a6d2 100644 --- a/tests/sys/netinet/libalias/Makefile +++ b/tests/sys/netinet/libalias/Makefile @@ -3,6 +3,10 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet/libalias BINDIR= ${TESTSDIR} +PLAIN_TESTS_C+= smedia + +LIBADD.smedia+= sbuf + ATF_TESTS_C+= 1_instance \ 2_natout \ 3_natin \ diff --git a/tests/sys/netinet/libalias/smedia.c b/tests/sys/netinet/libalias/smedia.c new file mode 100644 index 000000000000..e181a7a538af --- /dev/null +++ b/tests/sys/netinet/libalias/smedia.c @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2026 The FreeBSD Foundation + * + * This software was developed by Mark Johnston under sponsorship from + * the FreeBSD Foundation. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * A minimal regression test for a buffer overflow in alias_rtsp_out(). + */ + +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include + +int +main(void) +{ + uint8_t *packet; + struct ip ip; + struct tcphdr tcp; + struct sbuf sb; + struct libalias *la; + + sbuf_new(&sb, NULL, 0, SBUF_AUTOEXTEND); + sbuf_printf(&sb, "SETUP rtsp://example.com/media.mp4 RTSP/1.0\r\n"); + sbuf_printf(&sb, "CSeq: 1\r\n"); + sbuf_printf(&sb, "Transport: RTP/AVP;unicast;"); + for (int i = 0; i < 200; i++) + sbuf_printf(&sb, "client_port=%d-%d;", 2 * i, 2 * i + 1); + sbuf_printf(&sb, "\r\n\r\n"); + sbuf_finish(&sb); + + memset(&tcp, 0, sizeof(tcp)); + tcp.th_sport = htons(1234); + tcp.th_dport = htons(554); + tcp.th_off = 5; + + memset(&ip, 0, sizeof(ip)); + ip.ip_v = IPVERSION; + ip.ip_hl = sizeof(ip) / 4; + ip.ip_len = htons(sizeof(ip) + sizeof(tcp) + sbuf_len(&sb)); + ip.ip_id = htons(1); + ip.ip_ttl = 64; + ip.ip_p = IPPROTO_TCP; + ip.ip_src.s_addr = inet_addr("127.0.0.1"); + ip.ip_dst.s_addr = inet_addr("127.0.0.2"); + + packet = malloc(sizeof(ip) + sizeof(tcp) + sbuf_len(&sb)); + memcpy(packet, &ip, sizeof(ip)); + memcpy(packet + sizeof(ip), &tcp, sizeof(tcp)); + memcpy(packet + sizeof(ip) + sizeof(tcp), sbuf_data(&sb), + sbuf_len(&sb)); + + la = LibAliasInit(NULL); + LibAliasSetAddress(la, + (struct in_addr){.s_addr = inet_addr("127.0.0.1")}); + if (LibAliasOut(la, packet, sizeof(ip) + sizeof(tcp) + sbuf_len(&sb)) != + PKT_ALIAS_OK) + return (1); + LibAliasUninit(la); + return (0); +}