From nobody Sun Jan 12 19:32:59 2025 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 4YWQXW4Bfyz5l98b; Sun, 12 Jan 2025 19:32: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YWQXW3WDDz4NkX; Sun, 12 Jan 2025 19:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736710379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0xNOsOD4O7mQR1ty1acQNSECb3UWCGiqh8Rx+507mo=; b=YlxqjeP2+zm3RZOt5M5Yj/zed0KiCW7ay+2DEyFm1BgU/kG0KOvIZyutuovtyJZTnrKS95 8VCSNaLCZfA3xGJ+hS/6V4gY1ss65HTPjk0kivpQkE4RL0vcxspprncCVVxIBQBY27C6cA rwVQCX08AdjQ1GNrPTe/4JbG1uGc9uZ9KLufGOqTGa3b9+ORnMCa2PgqWrDtivhs002HjP 8k/fNFGFl1BNi42aQf8Lb4i7WUIsj/bKX0Kk1Yxfr3VHKCbNTVapkRA3oS9Bd8AUJjtGfo 3ufOVZAG4I3WM4FDIZLAvmeOCOkBm4/gsiqLr2IpH/rTX4n0Nd3XK9oVGev/lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736710379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0xNOsOD4O7mQR1ty1acQNSECb3UWCGiqh8Rx+507mo=; b=nkmKpgFfIoKQHvXz09wSmaIT2Khu87gj2M2cFBy1jKr+pLeINK+bfuHByORzGeFkQOtGPj LsJUgpniBx5FTqs62HKY7fD1exqcliIK/SM+ETYT30crLUN+S0sjd8XQtHT6osX0a8sqyN tMnPRFe5Xx5Oo53lQlY9GZuFRZoHBPSV3YizndF2Lu/0u3wFiWI7z9xGfo6ysiPxLbKmVh cr5fsQi0odg+Wp717hMJqiusY6Cnii/maLvzngnfiyMm6kf2UjSeUWDfRn7fssEzbypekz uGtWGsf5ohGc6Mtdy81WgpmBICczqNQ0SXgV4rCS/FCMbU18IsmGgNqjzNtXyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736710379; a=rsa-sha256; cv=none; b=RmBN+h4L37JpHW0NolcckXOfXFYsYXXtGQpQWS6v9iB0OkQefyyt9aQTBVwPrme3/i1ipe NeD3CG9r/VpyHrRlV7CfcciHrVtYn7t2Gw9ZN3z8QGrElHN3XDWo8svAEqMgnSVuF+KWMt RbmdbE0bkmLBJ40UzW3wyAhguSPtn/Q7GKBDAXaCGyZD4/9ze7gXi3NAFGBG+PXUcnnCh4 j93b2EhQuK/+oS84xnpGc3yvSvZt+aFLiTGkAiVSweXftW6oxISJOdRwbLC1AKcDN980hN Z2ukqwC8SdvHe/zvZNWrexsFdcTL7kVq4qOASMZ2lPsq48OxYIENccNbPvI11w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YWQXW2yGtzwx0; Sun, 12 Jan 2025 19:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50CJWxPW050233; Sun, 12 Jan 2025 19:32:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50CJWx0T050230; Sun, 12 Jan 2025 19:32:59 GMT (envelope-from git) Date: Sun, 12 Jan 2025 19:32:59 GMT Message-Id: <202501121932.50CJWx0T050230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 748e7bc1521c - stable/13 - bsnmpwalk: Fix crash on invalid data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 748e7bc1521c87d292e8762c59e415ac687f69a2 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=748e7bc1521c87d292e8762c59e415ac687f69a2 commit 748e7bc1521c87d292e8762c59e415ac687f69a2 Author: Shteryana Shopova AuthorDate: 2025-01-10 20:30:21 +0000 Commit: Ed Maste CommitDate: 2025-01-12 19:32:38 +0000 bsnmpwalk: Fix crash on invalid data PR: 258570 Reported by: Robert Morris Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D48422 (cherry picked from commit f021e3573519ff192fc708cda9ca4bba264c96f7) (cherry picked from commit 7fbbab2d326bcbfa1592c6104b745cd5973f5aaa) --- usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c index 81108387d3a4..9d5a693c7c68 100644 --- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c +++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c @@ -502,7 +502,7 @@ snmptool_walk(struct snmp_toolinfo *snmptoolctx) outputs += rc; - if ((u_int)rc < resp.nbindings) { + if ((u_int)rc < resp.nbindings || resp.nbindings == 0) { snmp_pdu_free(&resp); break; }