From nobody Tue Dec 16 23:43:01 2025 X-Original-To: dev-commits-src-branches@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 4dWD522KCnz6LPxB for ; Tue, 16 Dec 2025 23:43:02 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dWD520F4Tz3Fb0 for ; Tue, 16 Dec 2025 23:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928582; 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=pVcaMwhSJAvWlYJRCD2iOGtgCo6db1IlMcH1CG1M570=; b=CjH1hZcamlDgu77GVy8Z9h633F4Kq1N5wKoNiK3kG1zmfdhuVuKe8Uq8Ti2TovMsD1k6zu SK4FBNLDZw3ET7pdFHG7N43b3sBMhqrr20HYNGS6j3mnnEgQVMEp4J/ZhczTV8//0z5mgM tXUegm5O+j357JKkxfR1+lgXkQ9IBVrCcbksOH03SnZ5osVr5b0EV9Q9ESgKtR0bzW0zS9 RqLm60Z7UbWbAObzh37f6Gd2p0qhMKIG9DeIfR2ySOboXUfezYzq7T9I6zl7vWDmXbzfA1 FsRZPj2VEPwnwnx9bO9RvgCLY0YwQxf6bSsHyVuD2uRd7UcSvE157b/gFKnmtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928582; 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=pVcaMwhSJAvWlYJRCD2iOGtgCo6db1IlMcH1CG1M570=; b=mCzrti+GboaSINarcV6oO5ycpP9FEoAA+whHqlU6NWoKgWsQScLXz6JL3NSdzRvleyPPUJ hVTaFYnoohH7CuKlsEb+v8lC4Nl8ybETrf2prAbPK2sTmOUYCWl3owSUre+4ZH5YFdnKgu Y9rLn6H5RVP4FD2C1snow5znbvRVwuhto4Rdf+6g8w2bEAMiOGek0Ww4Bn2mC60HBCVa2q Hz56Jb3satnYfhgKN5b4s8M7FIaAsmWsYTcnKw1qV+64EuRDJTEghnx86jQH4tqw46i+X7 LrZ1TE+5pMMIE/iy4ej55yXYuj/N/f38Lvmkwqo/bOZ4EKxEgbmRU3gMI94oeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765928582; a=rsa-sha256; cv=none; b=ae+IsPf2BAYUX8bFrG/pGuUdOxqUK84yhsMY2x1o7QmZrCU/mqKVAlWWyKC1VdY3RpTw4Z YkvBYxwYrVJ+OfQVa76zVZDAfbcJcze8RNC5stCbaMFMs6BgB1VW+u5oWyI2bPUafg2CRP qO/O688s+iDunnnubc0A+UnlzkXOxrkYFo4L6yAK4YscMiwyE/toj65TBJi/9EiZF9/jTs RR7nIPaf6hk0dDmcHkSdwWzJdnmVz2DpVuy2oOBfNLAmPPjDPaYeBa05rQOvOYZ0x8F9/j qSZKzpRLXWZDdtYi6oQndMg2flPkbrF/GASYXxSZam66yUQrfQzLLZQMwU1YTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dWD515xtDzC1w for ; Tue, 16 Dec 2025 23:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22933 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 23:43:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 408f5c61821f - releng/15.0 - rtsold: Validate entries in domain search lists List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org 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: 408f5c61821f5b29f59b5a72bafa07d406db9834 Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 23:43:01 +0000 Message-Id: <6941ee85.22933.c5e601c@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=408f5c61821f5b29f59b5a72bafa07d406db9834 commit 408f5c61821f5b29f59b5a72bafa07d406db9834 Author: Mark Johnston AuthorDate: 2025-12-15 20:50:08 +0000 Commit: Mark Johnston CommitDate: 2025-12-16 23:42:34 +0000 rtsold: Validate entries in domain search lists Reported by: Kevin Day Approved by: so Security: FreeBSD-SA-25:12.rtsold Security: CVE-2025-14558 --- usr.sbin/rtsold/rtsol.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/usr.sbin/rtsold/rtsol.c b/usr.sbin/rtsold/rtsol.c index 79928932ca5c..a7d5a44a7d44 100644 --- a/usr.sbin/rtsold/rtsol.c +++ b/usr.sbin/rtsold/rtsol.c @@ -776,6 +776,41 @@ call_script(const char *const argv[], struct script_msg_head_t *sm_head) argv[0], status); } +#define PERIOD 0x2e +#define hyphenchar(c) ((c) == 0x2d) +#define periodchar(c) ((c) == PERIOD) +#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) || \ + ((c) >= 0x61 && (c) <= 0x7a)) +#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39) + +#define borderchar(c) (alphachar(c) || digitchar(c)) +#define middlechar(c) (borderchar(c) || hyphenchar(c)) + +static int +res_hnok(const char *dn) +{ + int pch = PERIOD, ch = *dn++; + + while (ch != '\0') { + int nch = *dn++; + + if (periodchar(ch)) { + ; + } else if (periodchar(pch)) { + if (!borderchar(ch)) + return (0); + } else if (periodchar(nch) || nch == '\0') { + if (!borderchar(ch)) + return (0); + } else { + if (!middlechar(ch)) + return (0); + } + pch = ch, ch = nch; + } + return (1); +} + /* Decode domain name label encoding in RFC 1035 Section 3.1 */ static size_t dname_labeldec(char *dst, size_t dlen, const char *src) @@ -804,12 +839,11 @@ dname_labeldec(char *dst, size_t dlen, const char *src) } *dst = '\0'; - /* - * XXX validate that domain name only contains valid characters - * for two reasons: 1) correctness, 2) we do not want to pass - * possible malicious, unescaped characters like `` to a script - * or program that could be exploited that way. - */ + if (!res_hnok(dst_origin)) { + warnmsg(LOG_INFO, __func__, + "invalid domain name '%s' was ignored", dst_origin); + return (0); + } return (src - src_origin); }