From nobody Tue Dec 16 23:39:32 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 4dWD104j29z6LPbV for ; Tue, 16 Dec 2025 23:39:32 +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 4dWD103YBrz3FQg for ; Tue, 16 Dec 2025 23:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928372; 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=chCciT1TzNZn+Rx/VT9jGAylREkKXH/9lE6eTDog1HQ=; b=hDLTvX3Ci9KsBbpmtv7svSkdq9GrKT3RJbMT7qYjJNFE6xphTQCPlNY/KpYdsX7khWhLQH WpePHnOlfUlMiZ3+leQHAdGNWqXeGQP87xikwWSyGEiLHD1VntfvYJWdd2P9MWiH8zU+TZ sAxc8j4pU4yeUWl/0eA01U8AMp+GTk7vFEB16+HWJuUyuEtxpWrgBoWyjX0wcEbUEFvKiS Q+S49qs/PrpaaURZQ9ew94PjQWfZ3L97NT+7kK15aBV28a/sWlLFWn1xxWN2ndct/BEPrZ 5KCJH1DPXn9de0ZVaHluTx5OwpHDkpN8mzAtCxu4WGKL3wGWVzKzULP6tX+CWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765928372; 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=chCciT1TzNZn+Rx/VT9jGAylREkKXH/9lE6eTDog1HQ=; b=Q5Rf/Gi+amg8WEYmpwZ+fmK/Yrd1YjLhEWUPoEBD3rPEDoItGnfJQiHB5sa3gmRGlEtnt9 FmGEPrvthhrfFe0oXcojTZJSQYxRnq36dI2lxUljeobTN1cdfRo09qVYrUoPogUe0dLgE2 kQ20lkhz051Iygq8RR6CjAgO9UWBHgGTOYDgHwbUvhljf3I9qodepXtuyEfRT29o1zVn7M caW/h5SJ51Kd/9V7QwCItKodWzev7ezSfDAb0upV0kIp25Eunr+tvfj3tzmHaKGhx3573S i38fGGrPpB8Hjd4MNHcOEZRbHpagbQYdWde01wB2ybc6wNSCXNxxwJyujN0EpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765928372; a=rsa-sha256; cv=none; b=Wtcmp/sZ1I3inhKloamoOm00PxjFPaJa02fRXj97rXpLGhxHG894a95J2LSHBJUZZrk1UX A6/LdA0pYug+lWrOawrNlpK7MnM4EV6RM73VmbJEklsVMNimmONvF5WnRu3EmqjzZbSKx4 3PFEo3f8j/m1afcQkN6Z64y5JRYy8Cgf371gU2u8Vj61ik9Xws/6VVLoItPs7h7EQ04Aih I/xuCddIUEjVis33rzadug08tHjJjgNa9OBk+p0K63rmttACvHCu0VvZ21tOSqvn9Nbicb 8m/dgS3F/XjMu62HInT9pr+2s+zyxTeUzuZNvCCcaqqL6NT1mDq53lwWEmgGnw== 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 4dWD1035TczBr6 for ; Tue, 16 Dec 2025 23:39:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22ce1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 23:39:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6759fbb1a553 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6759fbb1a553a4af1a344e266970613ac49622ab Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 23:39:32 +0000 Message-Id: <6941edb4.22ce1.21527294@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6759fbb1a553a4af1a344e266970613ac49622ab commit 6759fbb1a553a4af1a344e266970613ac49622ab Author: Mark Johnston AuthorDate: 2025-12-15 20:50:08 +0000 Commit: Mark Johnston CommitDate: 2025-12-16 23:39:27 +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); }