From nobody Wed Nov 26 16:02:40 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 4dGkq50xKLz6JG10 for ; Wed, 26 Nov 2025 16:02:41 +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 4dGkq46vFBz3Wtf for ; Wed, 26 Nov 2025 16:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764172961; 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=cvHcrppqJhUIoI6lRqYROevFcoL77tSvcNTKN63bWL0=; b=XHSNYJqarkDgrZZemoQWWMnll9BFFaYFwVuJSr/Qd41wgn119/68Vv1ede7D4zEOufzCjQ FyFeE3sZkNywFrU4euWGPQOA0k5ZRcDLxYQrq+zZlh3AYcUuWLgOzMd0VC1QGUTRl3ya8I Be1SNuvbDziNSsfCmNQamvIou3taKbnfSbu6eFPttZ5A72pz8dlXG13PDaShMt/JG39l/K pTWLRTK8SOI+t2/f5CRuwWjOAk/yc9balQtkCDKqFyvIKOYDzEl7S6dDoXWk15TWoNlQ2r khJZYn/Usb8lbASKAR3BboqEHSh10vJDQNrPSuAIonmuK4+a283FZHnDkTOOwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764172961; 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=cvHcrppqJhUIoI6lRqYROevFcoL77tSvcNTKN63bWL0=; b=EHGrlpnW4KxMxiV9Vfiyuh8eGrG1/162+sooqocjaeibfJb6RAUcV+JoqIzt6DClDsbLVd gq+qHy1CXmaAXlzAxwoanpWjsH0hPfVVRzrJzUA0D54mJDPh06Q2NBEftHlaIB0Hd6CyYo TChqwEWlpxVOqdSWum11f+piLWX41N7vTE5FPGPKqbGnTTwSJAJZvM1/RXdWHj7fqr6dso 3/ox/YfH+NaqRf1u4otAy415HZEWqnUSe00Pa4/yFtXVmmCCT8i4Q1ciuShmqPNMvKnPJ5 uQCdbLekUF/uadRJUiAvURBPyNi0OOjRNrCRzuOlYW//lgnjILabP/nA5w280g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764172961; a=rsa-sha256; cv=none; b=gJn0DINfA3Xk+4qfsxBkqvn1sqCnv0fOP32g06BsgV/sQ2x3/wdQB8hJrr9YC4yqQoE6LP i+emTrpViTQtf5MgjyDmQRS2Dzufl9vUiK1wLCW2yj9iem2R2JrhAWY4Lg5+btoxXyvDpB vRlx5GnFXv+JGgGdWJ5F/XLcUYY17Rmjh3xL3DkZutx0FlG+cYg4GT0HIpd+Xx4NP//VIb C6qMLkXVRWYdbsx4Z3NEFAuwpsETCb4A94+DpJX6nu9DxM+LzOuNwAdu17q7XykDL4Fd8H QNakGHH6PWh9X1aCebiSFuFx+eSHXfcdoiE3sG3OXsnHxvH0ve2HJrJBNEh79w== 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 4dGkq46Tb2ztkV for ; Wed, 26 Nov 2025 16:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 350de by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 16:02:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 2aed524b2329 - stable/13 - Mitigate YXDOMAIN and nodata non-referral answer poisoning. 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: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2aed524b2329fd4af929c7b6ef97fcdb02391177 Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 16:02:40 +0000 Message-Id: <692724a0.350de.5b6cb4d7@gitrepo.freebsd.org> The branch stable/13 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=2aed524b2329fd4af929c7b6ef97fcdb02391177 commit 2aed524b2329fd4af929c7b6ef97fcdb02391177 Author: Gordon Tetlow AuthorDate: 2025-11-21 21:24:58 +0000 Commit: Gordon Tetlow CommitDate: 2025-11-26 16:02:20 +0000 Mitigate YXDOMAIN and nodata non-referral answer poisoning. Add a fix to apply scrubbing of unsolicited NS RRSets (and their respective address records) for YXDOMAIN and nodata non-referral answers. This prevents a malicious actor from exploiting a possible cache poison attack. Obtained from: NLnet Labs Security: FreeBSD-SA-25:10.unbound Security: CVE-2025-11411 (cherry picked from commit 2a3a6a1771148a709c2d9694c1d66c41ce8dee79) --- contrib/unbound/iterator/iter_scrub.c | 39 +++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/contrib/unbound/iterator/iter_scrub.c b/contrib/unbound/iterator/iter_scrub.c index 553d3655f0e3..8507a3fb65ac 100644 --- a/contrib/unbound/iterator/iter_scrub.c +++ b/contrib/unbound/iterator/iter_scrub.c @@ -418,12 +418,13 @@ shorten_rrset(sldns_buffer* pkt, struct rrset_parse* rrset, int count) * @param qinfo: original query. * @param region: where to allocate synthesized CNAMEs. * @param env: module env with config options. + * @param zonename: name of server zone. * @return 0 on error. */ static int scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg, struct query_info* qinfo, struct regional* region, - struct module_env* env) + struct module_env* env, uint8_t* zonename) { uint8_t* sname = qinfo->qname; size_t snamelen = qinfo->qname_len; @@ -431,7 +432,8 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg, int cname_length = 0; /* number of CNAMEs, or DNAMEs */ if(FLAGS_GET_RCODE(msg->flags) != LDNS_RCODE_NOERROR && - FLAGS_GET_RCODE(msg->flags) != LDNS_RCODE_NXDOMAIN) + FLAGS_GET_RCODE(msg->flags) != LDNS_RCODE_NXDOMAIN && + FLAGS_GET_RCODE(msg->flags) != LDNS_RCODE_YXDOMAIN) return 1; /* For the ANSWER section, remove all "irrelevant" records and add @@ -470,6 +472,11 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg, &aliaslen, pkt)) { verbose(VERB_ALGO, "synthesized CNAME " "too long"); + if(FLAGS_GET_RCODE(msg->flags) == LDNS_RCODE_YXDOMAIN) { + prev = rrset; + rrset = rrset->rrset_all_next; + continue; + } return 0; } cname_length++; @@ -650,6 +657,29 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg, "RRset:", pkt, msg, prev, &rrset); continue; } + /* Also delete promiscuous NS for other RCODEs */ + if(FLAGS_GET_RCODE(msg->flags) != LDNS_RCODE_NOERROR + && env->cfg->iter_scrub_promiscuous) { + remove_rrset("normalize: removing promiscuous " + "RRset:", pkt, msg, prev, &rrset); + continue; + } + /* Also delete promiscuous NS for NOERROR with nodata + * for authoritative answers, not for delegations. + * NOERROR with an_rrsets!=0 already handled. + * Also NOERROR and soa_in_auth already handled. + * NOERROR with an_rrsets==0, and not a referral. + * referral is (NS not the zonename, noSOA). + */ + if(FLAGS_GET_RCODE(msg->flags) == LDNS_RCODE_NOERROR + && msg->an_rrsets == 0 + && !(dname_pkt_compare(pkt, rrset->dname, + zonename) != 0 && !soa_in_auth(msg)) + && env->cfg->iter_scrub_promiscuous) { + remove_rrset("normalize: removing promiscuous " + "RRset:", pkt, msg, prev, &rrset); + continue; + } if(nsset == NULL) { nsset = rrset; } else { @@ -1060,7 +1090,8 @@ scrub_message(sldns_buffer* pkt, struct msg_parse* msg, /* this is not required for basic operation but is a forgery * resistance (security) feature */ if((FLAGS_GET_RCODE(msg->flags) == LDNS_RCODE_NOERROR || - FLAGS_GET_RCODE(msg->flags) == LDNS_RCODE_NXDOMAIN) && + FLAGS_GET_RCODE(msg->flags) == LDNS_RCODE_NXDOMAIN || + FLAGS_GET_RCODE(msg->flags) == LDNS_RCODE_YXDOMAIN) && msg->qdcount == 0) return 0; @@ -1074,7 +1105,7 @@ scrub_message(sldns_buffer* pkt, struct msg_parse* msg, } /* normalize the response, this cleans up the additional. */ - if(!scrub_normalize(pkt, msg, qinfo, region, env)) + if(!scrub_normalize(pkt, msg, qinfo, region, env, zonename)) return 0; /* delete all out-of-zone information */ if(!scrub_sanitize(pkt, msg, qinfo, zonename, env, ie, qstate))