From nobody Tue Nov 17 17:01:59 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 4jTWHC48L3z71QBd for ; Tue, 17 Nov 2026 17:01:59 +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 4jTWHC1MHYz3Q3C for ; Tue, 17 Nov 2026 17:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934919; 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=YrF2M2ZOW5Z8KEnShbwo4zptW+k5EtM/ZmVW7m1xpqE=; b=U6Infd/tVjWBpIxWnipvfc0A4oHvTsGdsUEc3syAAlM1vTuXdW3j9ecpBif3LI3BtoQd+B glvH4TKbyCz0ckugcnLePQt6soKLK81fes1ZCFDyF0z9cbpzKEu++wMVgAMdNDz6g9F5PY T4S+FbQH1mpDhHYD330IR5x2Qwl+tyo/3vG7Df7SEUZbCeK383KqdyBQCj/0cGQaiWeQYj EEGIn225aP0QRsROkVCPP3VrXlBlRV0SeiN1SvGjA3yW1Tpr/fedcrCxyddWz+CiIruNys xkYQP5Y6qbgHLNY/rD2UCuYkptnTpV1x90/fuBFlBCxx60OacCtrabYYM+VJ2w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934919; b=fx5NHoS9+ojee5z28/diRhEOcPj0ksoggiE218198ssGYB6JqlSctXiGHXR8VE2C3z2nQ9 BN6sA+3C9QvOLSdyoSXelScOAW/ypKDyzQhhNbM1YRMf+v8WxYgK+Vv+07Hu3v2DYLRRVp f0wgASPM/DW3pygtH2hGvDFPGnFHHKIDx0gzhFsDi7/+PRywkweJpbbWovqu8PtJV89SCk 5pzBfyJQQqbYQD6q946imjp5P/cd8nb/uRTXQOpdSgr0sbBgUXJ1Ux+E6uMe7KpoFyHEYb SkRC7JZFRbsmXJLJsXXvNnzeW7/VkgpntC36QL0gdEVssDCy0PDTR+bTfTxS+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934919; 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=YrF2M2ZOW5Z8KEnShbwo4zptW+k5EtM/ZmVW7m1xpqE=; b=u5R04SbGTSoIJiE610LSlAsGtewnxSID+bFsCdUPE8iiwEykPtoQK8yLzwV53lpE+gdBfZ cJU40rX/29FxaNucQGrJejUoJ3fVRBm9vMQybYvvKdcENuc/r+WPuVie9e5jFDhUQoJdvx HDQ/bjPx/XuDGd2uOWTnn48dO/uuRbUcOYDOc/jpalbDWg0DrUvGC5MZfXpkx6TU0O1pIZ zW9h80Jw3HBXyCS9zYLOBe7xQyxPZwCVrSL/NvNRt/+VuQBo5eEYpIO6nQt71RgvokmCBF 1YyJUUvcCnvYonDol28T1nvr4z915uqHBM+uTqgdH8NoIyhm+kYAJ6d3fhrPOg== 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 4jTWHC11XTzr88 for ; Tue, 17 Nov 2026 17:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:01:59 +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: 3de83038140e - main - bsnmp: mask reserved SNMPv3 msgFlags bits on input 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: 3de83038140eb83ea5b74436e3730715a7bc5418 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:01:59 +0000 Message-Id: <6afc8887.1df6d.623f3d84@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3de83038140eb83ea5b74436e3730715a7bc5418 commit 3de83038140eb83ea5b74436e3730715a7bc5418 Author: Maxim Konovalov AuthorDate: 2026-11-12 00:43:05 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:01 +0000 bsnmp: mask reserved SNMPv3 msgFlags bits on input snmp_pdu_decode_header() reads the msgFlags octet straight into pdu->flags and never sanitises it. Only bits 0..2 are defined on the wire (authFlag, privFlag, reportableFlag). Bit 7 (0x80) is bsnmp's internal SNMP_MSG_AUTODISCOVER marker: it shares the same field and is tested later as "this is discovery, skip USM and VACM". Because the byte is taken verbatim from an unauthenticated peer, a client that sets bit 7 of msgFlags has (pdu->flags & SNMP_MSG_AUTODISCOVER) read true straight after header decode, forging the discovery state. A noAuthNoPriv user -- which has no digest to verify -- can thus mark an ordinary request as discovery and have it bypass the VACM access check, operating outside its configured views. Keep only the three defined wire bits when decoding msgFlags, so the internal marker can never be set from the network. Approved by: so Security: FreeBSD-SA-26:89.bsnmp Reviewed by: harti Fixes: 135f7de5ddb6 --- contrib/bsnmp/lib/snmp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contrib/bsnmp/lib/snmp.c b/contrib/bsnmp/lib/snmp.c index d1dabc8884a0..acdf5df0c683 100644 --- a/contrib/bsnmp/lib/snmp.c +++ b/contrib/bsnmp/lib/snmp.c @@ -523,6 +523,13 @@ snmp_pdu_decode_header(struct asn_buf *b, struct snmp_pdu *pdu) snmp_error("cannot decode msg flags"); return (SNMP_CODE_FAILED); } + /* + * msgFlags is attacker-controlled. Keep only the three + * defined wire bits, so a client cannot forge an internal + * marker that shares this byte (SNMP_MSG_AUTODISCOVER). + */ + pdu->flags &= (SNMP_MSG_AUTH_FLAG | SNMP_MSG_PRIV_FLAG | + SNMP_MSG_REPORT_FLAG); if (asn_get_integer(b, &pdu->security_model) != ASN_ERR_OK) { snmp_error("cannot decode msg size");