From nobody Tue Nov 17 17:08:29 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 4jTWQk0ZLfz71SXb 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 4jTWQj3xn8z4NJD for ; Tue, 17 Nov 2026 17:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935309; 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=mvvg5rUo4CfKyObSGTIIrucZusK3UbbDmlWl+nx9pMk=; b=Nq+eHPyCru8X64ovON7mpqv8uMsOFOzQYHORsK01Wqcrm2RFbs9LHlHZf7SoM5m/mQgkC0 D28lzEyyKDP1n9ZRGaCvcw533ZTQN6qVu0FWAbv4t1+niq5v+etMXa0wAUCzqZpaj8Lyis F4JZN+aH8SXNUwEJyBrpEbh/kUh66e4sNUpXjGcENs7NSGFWQ6YkAzkGvr6AVq56GIsKWG +lkgYzemtImIYR8+xaSqyHSLUqoLEznnDVlvm+J65Xfxyf+9Mwyns5pVhggOjpkypy9ipG 2Zm2H6bTh9ZPReAlnJ7IDdUFWpqVfxi7ed+mXQRSaORZmTsd//zAxGTck1/vmQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935309; b=mg0bobDrCH1l+ZcDed3IKWTEAFLHs9aVfws2cFmnXW129FLmEgLKR5SVBNJbts9oFLmaPg jB4+MwLyD8wytWM98HsjjRDq3BHNqDQZYDr1ES2LZs6375L/he3vpOPx/RRxatOBb1syP8 esBfOloFYXOhwM2JQP/KWS9NeaQIlh/gv89QAYBIUxyZS3XZpJjeydwaQH9h2ndbbk/RO9 6t13eoJgG475UBGvifqZTQoOdayIbL5OwIFM273R6AD18mtah08UZB5B4XA0bZf33lFGiN +eWphEuKA1DmNKh0ZvtfpiuSsBir6bbuinYw3O/w+b879IsBm+L0t0FcPtNJPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935309; 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=mvvg5rUo4CfKyObSGTIIrucZusK3UbbDmlWl+nx9pMk=; b=m4GY+Ai1ANpeRpWdxGtjjiD+SmPIbFgZ7NSm5Usw6Oafu47y2/aumOKW/YAXAz46sYuBKP E5chu5uHTaFUW4s0fHFSZZlAG+2twJBt9kthRkpw85S5XkIhchRD2wWt2LncJHnIVy7vDe 6li0n03sZmwHTynVEJCmhz+oUuaQB/V2nwu6CC1Qqk8KR7PVa9+PYzzQQA8N5nXzr943mn 1y3jKN6V7LNlCewv2Xwv2NBeUqIhHqFxcghgW2LNXUNaTyE8vaLxRK2pTEXUCIXOejjMG5 ic5uRRFcjpHDTeoGRGlgp1+tEA5lR30lGmFJuqEhFNupap6kE8bajnS/UeUFyA== 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 4jTWQj3GHqzrsX for ; Tue, 17 Nov 2026 17:08:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e4ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:08:29 +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: 5ef7dd63cd95 - releng/15.1 - 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/15.1 X-Git-Reftype: branch X-Git-Commit: 5ef7dd63cd95b5bbe1e8fc5cbbb1394f2cb1bab1 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:08:29 +0000 Message-Id: <6afc8a0d.1e4ea.11991292@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ef7dd63cd95b5bbe1e8fc5cbbb1394f2cb1bab1 commit 5ef7dd63cd95b5bbe1e8fc5cbbb1394f2cb1bab1 Author: Maxim Konovalov AuthorDate: 2026-11-12 00:43:05 +0000 Commit: Mark Johnston CommitDate: 2026-11-16 21:25:03 +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");