From nobody Tue Nov 17 17:05:21 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 4jTWM56q6hz71RSt for ; Tue, 17 Nov 2026 17:05:21 +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 4jTWM542Dqz4HMy for ; Tue, 17 Nov 2026 17:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935121; 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=0bZNCHbXrSfWB5u5myJlG6qQif/zSby7FePDG3hr7ys=; b=HGDORXzL7ikQosxII/fxOZmVhetnD6oe2Kqv4Wnjm9l6S4Sg2wFXDxMVz4Wd909TUerbYo cFUDjUUrRikxvJ5GNKEr+n3O+fBqOyyCFfprS0HIzLLF2BSGQcdRXlJh0KiGGemKL1R6OI JllE4HuNxArjr2sbtFui/KT3zj2Ei8lNwdT82oQYG4ms5QLNjLvYarll9/KmpFp9pu8fOA uu0v+7txrC+z/iVWkkB/ohA+CyC0xGz5OHvmJYmlSVjgLMA9qb63Ifk1pmaUcN7nLqxhVF WO5ukwtI1FXMaXWtYOUNkzKHRthZH6O13pwOJUeF5WN/6BZtUxdQQOxa/O7jGA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935121; b=nTe3PU6+UAF+O6HQiRHesx5xKimvkrGPL0zM9l3IpoA5LwUzqJ33ghQfLuOQClqkVVGABs A2rKn9/PO5BEtrsVWH5Wk49IFxFx27xLrgpj4DHAg0mIk11aPdqzoWnVpGo3WXwBF2yjQh Bge0eg2+2M/RAqX4VODzjYJOS2x4VzuhAI04JWZM1zeanqcNNgzp6/VVYz56zBYdeEpUfQ /uWn5V0XpLp8T8j3n6aRduJksXVgfg0CcliibQcsMBLrVrsHBL/I6hP0H1TFZ4MZFFWmdb k2+KoY3Es1KFgpZcGwbPOtufDddDLBf8nfnOsG/l9y23upJv4B2F2wyvhWy/RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935121; 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=0bZNCHbXrSfWB5u5myJlG6qQif/zSby7FePDG3hr7ys=; b=SNEK9j4jLXmklrarn4dSDj26Wykc4WIkwKu4n9MC11ppKngvXYSPzmxw5uUOpQ5PlkKk4g dvggbk6ojLhSoO57/a9tdr7UZI2ibzxE4LLR5fvkSGwE4eZsB45s5LsDnZXGyqO8STyMRL 9w8sndMqNLP/2tl3unWCQKnAS3T9sgrMOQxqOB7f89PbDmrI007Oxm+DEo54HEHvXXlrZ0 jHp2kTWmKjcaezxVT9oSbtutmszu66zE3P0q1Kt9XLReKGQVyj826i/tOPRjnp/Hakbobo TxU0D5AONs7T/NFFHbnxDtL2ezHe8u4cvduz3rjoumoaPtQAuN4oNptpp8gHYg== 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 4jTWM53hFPzrjh for ; Tue, 17 Nov 2026 17:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d15e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:05:21 +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: 546bf20b2d1b - releng/14.5 - 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/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 546bf20b2d1b9777c0567387bf9530cb0b90c6f3 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:05:21 +0000 Message-Id: <6afc8951.1d15e.15603b2b@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=546bf20b2d1b9777c0567387bf9530cb0b90c6f3 commit 546bf20b2d1b9777c0567387bf9530cb0b90c6f3 Author: Maxim Konovalov AuthorDate: 2026-11-12 00:43:05 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:17:13 +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");