From nobody Tue Nov 17 17:02:00 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 4jTWHD3V98z71QBj for ; Tue, 17 Nov 2026 17:02:00 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWHD1kdrz3Q3R for ; Tue, 17 Nov 2026 17:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilbcPhg4BGsfMuagoWI9T0FMZYpIpPHbyDMZBtoOGIw=; b=WQndQg/Uy4Yny83d0QWh3MOHe8AB7OHAbLc4EzFdyUNjxTJJTYTTsUaSioZp1lfIaTCCbu +1NM0LNik6NhMAyzp9I+QmkUl3u4XxrfAzCC/ahBzUm7A98XvxULwwdNXGDy+j+28DlMXJ hkDwyGY/KQkeB9804z6znMyS3BkiuJlr5fHiVzXXMVNPSplokN1vKqVRySf6cQOVgEehzA lifSEc8I3aEaF3j3FXxUAaYvb2vi52nWlyY64u84KjooUT3oC0L8LzQsk9zN0Nd+q8cgOD NIdXeCbO/xSlOfM3D/vnJp8cxuo95jsxWrEOm2cG3pevyh6D+tSCIDp728ru4A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934920; b=sj91Vd2z+P3xFCjCcgf4f+38V9c8SXJrKnTCzfDGxiaZZrasrsSmLgsEWWUqgsPoCdSR3w Gatfn87eYvLgfzMsZAxpNS/8jhE3hJ2LUvyfli/eeMKovz8dO+bSbz6AyVNFwgMc2/O5/d 1rfMzFvFjt7o7Cs+X+jv734sQYsfpGwa6U38BrDxSorjb6O/c9zFIZNbLqpxRr9K7PnzpW iXb2i6N5hBzTEyVwPzEPg36Prnqa6hCA0pa7ZDct0j98vvZamB8Wn5zuR1Aarqoz0C6vah mdPCwuF2I2ILWxiLPio0sY0usE2wJRTCkZHKiJoEThh7lTETs3qw1vhD7CFdiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ilbcPhg4BGsfMuagoWI9T0FMZYpIpPHbyDMZBtoOGIw=; b=tn2jK/F2Fk6YOCnfDk5Q4NadgEkTvx6E5pGr23EHzwdYKSXK09+r24V+IpbZ81AMLeEI0T nTGJAe5667NeMRfzBk8zFwA/3ZlW0A5z6HIUCB3G+CF19RMkQnEe9FyOj2ElzWjRpmj9BO KOzMuCpwQTW3werwiGXRjrpl9G5xE9UJoHij3gIp7q/dfaFdcye8cps/BWS9JCd179V5U2 b3aPEHaqFAPLTkqTMi977roFAMnS2OFVCp1hDeGLphOmSxDHELVBy85Ix/h6VT2Mb3pqEJ CXUqsIRKSVFcw2Z6Qb/3rryJmnFdpWhUhzKByc3Qd7ywqx0WuLj5eQi0SY1GFw== 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 4jTWHD1NTbzrg5 for ; Tue, 17 Nov 2026 17:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d1b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Maxim Konovalov From: Mark Johnston Subject: git: eedef3d6cee2 - main - bsnmp: let an SNMPv3 discovery message elicit only a Report List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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/main X-Git-Reftype: branch X-Git-Commit: eedef3d6cee25a699bbea0b1f01612144c706a81 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:00 +0000 Message-Id: <6afc8888.1d1b8.6072c6e8@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eedef3d6cee25a699bbea0b1f01612144c706a81 commit eedef3d6cee25a699bbea0b1f01612144c706a81 Author: Maxim Konovalov AuthorDate: 2026-11-12 00:43:06 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:01 +0000 bsnmp: let an SNMPv3 discovery message elicit only a Report An SNMPv3 message with no variable bindings is treated as RFC 3414 engineID (or time-window) discovery: snmp_input_start() appends a single usmStats counter to the request, and snmp_pdu_auth_access() skips the VACM check because the AUTODISCOVER flag is set. The request's verb was then still dispatched by type. A genuine discovery is a GET and simply reads that counter back -- the intended Report -- but a zero-binding GETNEXT or GETBULK instead walks forward from the appended OID, and with VACM skipped it returns the next registered object(s): an unauthenticated read of the agent's USM and VACM configuration (objects at or after 1.3.6.1.6.3.15). Force the verb of a discovery message to GET, so the appended counter is read as-is and no walk (or SET) can run under the skipped-VACM state. Genuine discovery, which already uses GET, is unaffected. This complements the earlier change that rejects an AUTODISCOVER message carrying its own bindings; that guard is never reached on this path, because the offending binding is appended by the agent after the zero-binding test. Approved by: so Security: FreeBSD-SA-26:89.bsnmp Reviewed by: harti Fixes: 135f7de5ddb6 --- contrib/bsnmp/snmpd/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/contrib/bsnmp/snmpd/main.c b/contrib/bsnmp/snmpd/main.c index add9ec680eb1..526fbb38b8f8 100644 --- a/contrib/bsnmp/snmpd/main.c +++ b/contrib/bsnmp/snmpd/main.c @@ -644,6 +644,15 @@ decoded: pdu->engine.engine_boots = snmpd_engine.engine_boots; pdu->engine.engine_time = snmpd_engine.engine_time; } + /* + * A discovery message may only elicit a Report. Force GET + * so the appended usmStats counter is read back as-is: a + * GETNEXT or GETBULK would otherwise walk forward from it, + * and a SET act on it, all with VACM skipped for the + * AUTODISCOVER flag. + */ + if ((pdu->flags & SNMP_MSG_AUTODISCOVER) != 0) + pdu->type = SNMP_PDU_GET; } else if (pdu->user.auth_proto != SNMP_AUTH_NOAUTH && (pdu->engine.engine_boots == 0 || pdu->engine.engine_time == 0)) { snmpd_usmstats.not_in_time_windows++;