From nobody Tue Dec 16 23:45:05 2025 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 4dWD7V1wQRz6LPh0 for ; Tue, 16 Dec 2025 23:45:10 +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 4dWD7V1945z3Knl for ; Tue, 16 Dec 2025 23:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928710; 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=yjzSrZEbNsuhcVzSKMWW2FiSV1PpLqWHFrO46/em2lc=; b=RfcWxuAU+ADAakUvaD9cN96GzKufkVJF+rX5L/hIOXMvHPiiVewz40TbO942/vc3ujCNQk Zl7mr38k7OpoMdKI8tC5KSq9CQQK2Zh7ErWbewDMdIvwowmUxGrXX24cxh1ExuMpCOjagD 18ap7N5svGaCg/qywERTIp3tD40FTxVE6FXL4+ylIT5XA5a6MZUY7LcBh6QL6NFReYB49n WY9r2hvlUC8PkPT+1wuNGYMG14C3qwy/a/onKOv0UGrP2zZVrEkBOkmpCoCAKvWTp981t7 SmlsK7Dj1feEl8bapAFNUYoeaQKRqeSJ2vN0vdBMqs/C6yDRgMk3XTjL9cgMDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928710; 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=yjzSrZEbNsuhcVzSKMWW2FiSV1PpLqWHFrO46/em2lc=; b=VJyayEtAllnNizdV4MgJbtj74+k9RUmm5zB9+vhB/Ji0/EIEWWqd8YNGDJYSscH0/81BCa DcBkpoJtcG0Z5g5dnw6nQepAL4MztibjfB+53TTOOtdkIPv7oUfMve++cuCYHh6kXZ41fX XIV46nmSrUfvF6uVngoLcpuKxYdO9fX6uWCkxv4sYnoiIinUb1GIS1C4RrnuKvmTUvt+9a vMaWMEfwaGvuGvzpixfUMcoCHxZP6uoZuoWTRwaKZvYA9kxxk4SZlZHh9O2xKUo/A1G9Ms 7RZrCWnsyNXY4RA6QEuVnLIQD4gdKDXn/WZhh4l/7SJf2i8U9BMDw+9bwNNbCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765928710; a=rsa-sha256; cv=none; b=Rg8+yn28vold+EqJpiHahCQzSOLLzUESU1eVk78w94mHIXtsdqnUDe+tLnk16Ap4ScuM3v Xve5fvgU8qJ8FtzKsu9cIenKkOGSyDv/Tr1mlmJEHJ/ucgZV173Awew5WNUlwoghAx8hr8 rRjYqt20iUY5tw7eA8tHI/SJSD+wRQ3cyZZxphXuLZS/szhgRlqHPGzq5zuP1Lpb1n6Iu9 tN94X01jGpQlXPhRjLir+yu8aW+p7x2/b2+bRTLGAAavNF/Q+NauzYtyIMSMUwanGsYXzR e2e3YAAJSgq19OF98kBgKO1d2Y/BXJDd6zHw3iNCCEjf0kpEO0K+qow//B/kkA== 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 4dWD7V0jMYzCXx for ; Tue, 16 Dec 2025 23:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24121 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 23:45:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 26702912e857 - stable/14 - rtsold: Validate entries in domain search lists 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 26702912e85700ec3fb761382d445df815789f92 Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 23:45:05 +0000 Message-Id: <6941ef01.24121.6d52d104@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26702912e85700ec3fb761382d445df815789f92 commit 26702912e85700ec3fb761382d445df815789f92 Author: Mark Johnston AuthorDate: 2025-12-15 20:50:08 +0000 Commit: Mark Johnston CommitDate: 2025-12-16 23:44:52 +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 (cherry picked from commit bf804f69dd94b3c98962618b4ad3b48a35bff2ff) --- 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); }