From nobody Tue Nov 17 17:02: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 4jTWJM4hX5z71Qtw for ; Tue, 17 Nov 2026 17:02: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 4jTWJM169vz4C8f for ; Tue, 17 Nov 2026 17:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934979; 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=CPTdapbSzQQu4UNTbdZfW6nDOM+/ItA2Eu36GoneG6Y=; b=wndGGycskZZgBRdFPg7k/SoyLdFoYZKwXty1RUmhaYfY+yqTp2BuMgnTuaTV3j52wWk/Qn /gl3PBZ0N2PsO7YLSyuEY2F6QbLgb6uwdNi+RPKmsGoy7+dIf9Po0F/MIldVl+jqsB3zmg fgs8/MICDzM3vt/+VsloEP5m/5vpRcgCpOAthtAe761sGjvTo0DSZVE/C6uTvEHaL9r+Jg AvtK7Kbcjzxw6yaNdIQt/2RXWgH9z469O6p4xqRSd/s4Vj6MjHu/8lVttYQt83YHQhiy/O y9wbMpVbRUPeIGm/uoUfqe1loB/a+XvO+oO/rPNULEXQcefaUaggLY8oX7ZROQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934979; b=tlCTuuVA85aNtZtQNLxFgUoHyPI5JYXal0RRS0T+OC064pj/oKoSzRbN/+JCv9rlTz6Pi0 Nn5itOsCxTjhsHigcjGuOkE8QO4jdotIgKFswblN1YHIoyR6sHPkKhs6T4PBi1OmiPf+jz +FJh/c2oe5Sk26IsDSTUlwkE4n8BaMJ0WPvFiKSWIBdbh2gTUMQfDeyCpIPVPNTDFKdp/7 8SIdEiF+LQ8hT6bR7tsrgXozM/4q9CuLy3a1d81G1S9UKAWKnNhL4to9qbRn7iKW9v/Yq1 ab40EDHF/kXxqIQgN5KQJHKNQeK1QIE2lVmwlw1mih1fD/eWryeQqzZgXWV8PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934979; 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=CPTdapbSzQQu4UNTbdZfW6nDOM+/ItA2Eu36GoneG6Y=; b=SUBF5qauiC+uHMzNtG/KkXSOcNti/MtTfEaWPvhFXUVNZNh6ebbm9CG1oouD6oD8ClXgKx yazU4GNQky4BVTg6kNRPnPQ9vNtxGnNd66gvCSW0M8AGQcW6kR/mleLeuPPT4ZDrCHV8Lf wc5SjSWXrSeK+etDEgWbVfd7s3n6F7qdDjMYJJi4wQySfAM+nUruozoCX6NwecS6WZnOC/ w5eEVcxt2WwhwvhQdACyPDZmFHcsm43x6wso2lXh8Us+VuhppaU3zbj2R/a1ByhWsuMcLF 1QiZc7rLSgcNDWe1F1dn9UXJBCkR719Norz7vAVFEO2icjzrB4MnzZeD9a6jrw== 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 4jTWJM0g4Tzr6P for ; Tue, 17 Nov 2026 17:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:02:59 +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: 97eef393b41f - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 97eef393b41f2d9bb76524069091fb2a25b264f7 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:02:59 +0000 Message-Id: <6afc88c3.1df72.7b1ec686@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=97eef393b41f2d9bb76524069091fb2a25b264f7 commit 97eef393b41f2d9bb76524069091fb2a25b264f7 Author: Maxim Konovalov AuthorDate: 2026-11-12 00:43:05 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 13:24:11 +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");