From nobody Tue Nov 17 17:08:30 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 4jTWQk6Nytz71SM8 for ; Tue, 17 Nov 2026 17:08:30 +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 4jTWQk3ztZz4N5B for ; Tue, 17 Nov 2026 17:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935310; 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=unUoSaASqOwVh+B4NjW+oKMNNwlC3X0mCZJkUAY0XUQ=; b=lpUErKVaa7NmGpi5WB97NR/+WZ5i4/hFTWFupyWdb46ewU58Aj5d8TzoDGAlKk5PtiHQbp kGf3T6aRlp3ByzHvcw+gCHBjBNp5XnUfOQOkUgVWM/Zi2ou4To20n97eNbm4if90SPtOvB elqlx6c5Wcyst44Wkw8m29pyG58gqEadgKC6utDIckwwx+h2QY9DRwSfzk4HCarvggeDu0 ksLkT4DID3g3Cq9Mis67uNrnlhEVrISTaJ38uDFGFqRXKrz9zgH9aBS07XaVcUbkGDeW1R hN/+geAiYZQ2jRTYlqXV1jCHl8CiWeusMt11YL4EPeUkG0H94rj5LzIVGHp9hQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935310; b=jT+pkJiMOeRhCK0/GIPg19r5cykriOUUePMhc3Y1hwM2bUcHuomPAW05MQAYsXQgGWrijp nVYvdY4rN0ejgegYK5ux8M27N3A5SDr4T1q5B41olmH7Sr7/cpj+Iu1FzZS/Q16Msv7vbJ 8p7xesvOXCo11NVbRvzEYp4w4NnpvlNdzv4b+EsW61N5NMKgtg/oD3nVtoq3eLsQsQQw+A CyAG3jP2dLT1R6+4jQm4aebQluLdkQcIdPwS+5cX2mkLND4m76KXBPXh230eXAlvVQ38VT AXpVT/mnY+VG4I3w3KtE/IbOb9U/0NrtEAXDw0uWi32vnzkNNvOUxu58emytjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935310; 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=unUoSaASqOwVh+B4NjW+oKMNNwlC3X0mCZJkUAY0XUQ=; b=vlDYqMhbCNWTdc57FBEnxt8e+Pqpk30E84YcpD8oCOuwjM93zpgK6dgWuute8ycPpGGrUK 5Gok8zmW8BsMnHfkX0gcyj9h9vyirOUnbmv8fSuqTG6MK6neqqyyKbjnUV0IHM6TelTzOQ wamK7JeNNAC4bdLydTuGGc5Zzk8oIgnF/KDxfT7ZCWoIK1zGT+qUTTgRFpeqFZGdeGoeIv RhBePkS396ngTXCmfc7LY+5s6nTmikNuWR9H8JBRv58B7+zKQpXWCDpwYNw/DIt93yRQWz 791IUnRHn2HFI+Nfqzgl7f8ULugw1rmqEWZR/U84v/aoUXB1bgXQXHY7gfg2SQ== 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 4jTWQk3W5yzrhb for ; Tue, 17 Nov 2026 17:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Maxim Konovalov From: Mark Johnston Subject: git: 1725a5fc022b - releng/15.1 - 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 1725a5fc022bda7afcfb4525d37643cfa61948bd Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:30 +0000 Message-Id: <6afc8a0e.1f8.5e8b01c2@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1725a5fc022bda7afcfb4525d37643cfa61948bd commit 1725a5fc022bda7afcfb4525d37643cfa61948bd Author: Maxim Konovalov AuthorDate: 2026-11-12 00:43:06 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:25:06 +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++;