From nobody Mon Jan 20 14:26:26 2025 X-Original-To: dev-commits-src-branches@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 4YcCM642Gjz5lPKq; Mon, 20 Jan 2025 14:26:26 +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 4YcCM63CXYz48jP; Mon, 20 Jan 2025 14:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737383186; 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=Qnb+3m0uB0w968B1ENQBB5saPPYqASIAeYlnQvWXZ98=; b=bLQV0lo9CS4zlnIqK+7xYyNS27Ztbtw2ahtREt6s9YaiUQ7jGH0AfRFpHA0Siqe5fdk0Kd c17COTk4x7XA02ftXrI97LNBRJL3FtLJtKgvXzfxouA6KBq4Oe0NriPIVGjowU14WD9KND sSZtru+Eb6Xxy1JVgUaxTQlySPRrdo/ATaiXxZbKObTKMsyj7/Bnc25dvpxOHevr5UFUEj yJMSASuenVTfearSZO3y1Re8SsQkugW/heRgNGkludJcAsLGW1zxkCiy8szKWH1bUZ0CfH GcEjxnz7nFQ6KGXS+Fw/3x/MZB3Og/90FDr8tLPhT14848hoAlrozBzgTNDoow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737383186; 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=Qnb+3m0uB0w968B1ENQBB5saPPYqASIAeYlnQvWXZ98=; b=BK+XW0ARaGn4o45R9OqOpsVrn7R0bZYMMeLKdrpsXVpzqu2RyUmMYDnsb94zdjsMZQ47B5 Ma4KRdrxEl5x4P8C7EzJqdXAuzKGbLKZ1CvKbsYDpdFasGSK069QBBLOoxg2e2QW7OCFaD U6Nm2ocPKkAwQAd0yU3yag8ew1ZYf7v8Z3g/P1Y2yufNjgZhxNBa2Oi5PqQQbGfUi+/m3O 0q7RHGJcOo0imM3czJOAA+rLy2VapvXNFa/T2xjH4jRB4KDy7mSjH/3CxGkPTp+MopFX/P UgJt1PDw8i7bKRk1knUZLm6NIpvjjjxHurNDELnhLB6Oyiey4bTouPbM6Psjag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737383186; a=rsa-sha256; cv=none; b=AV3W/7v+IQuC1jzG+BraAwwSeesy3Cwq5QfKHkdbyc1IxY7IM2hzQWvFrhnaLSN/mAWz+6 PojzVop1SOAOTznty/u6RTtnkZaGXLL1gZTDYlT469xQT3sX9/MxN5bQONZlPcGaOjLnBl sNNFLJ0yrefEM8EMKW9pVuXuylE5Hgyi7A02bqcjTRsLMiB4oWwZ86JY83eIodyXjgGw0p jIs5yr0iKB7yFVtyXlKJwKFBPxJlssswwEsWoFPP3hYbeQmGjYlzrwkNQmhhQs3wykIpkp vk7RHhv5nGLhU/r0BUkRvLRXeJX1mDKKT0G/Vu2znqXqu0k5HdWh5XmMeK5j1Q== 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 4YcCM62dlTz7sv; Mon, 20 Jan 2025 14:26:26 +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 50KEQQfV087032; Mon, 20 Jan 2025 14:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KEQQbb087029; Mon, 20 Jan 2025 14:26:26 GMT (envelope-from git) Date: Mon, 20 Jan 2025 14:26:26 GMT Message-Id: <202501201426.50KEQQbb087029@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: 0bfbd30663b6 - stable/14 - libbsnmptools: avoid uninitialized snmptoolctx->passwd with empty password List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 0bfbd30663b68a851ebf24667d121c6891c86827 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0bfbd30663b68a851ebf24667d121c6891c86827 commit 0bfbd30663b68a851ebf24667d121c6891c86827 Author: Gleb Smirnoff AuthorDate: 2025-01-11 05:08:02 +0000 Commit: Ed Maste CommitDate: 2025-01-20 14:25:14 +0000 libbsnmptools: avoid uninitialized snmptoolctx->passwd with empty password The removed check left snmptoolctx->passwd pointer to uninitialized memory. Always calling strlcpy(3) would guarantee that with empty password it will point to empty string. Submitted by: markj PR: 283909 (cherry picked from commit 3999a860d6e899de98b1025317d2d0ef1f83255f) --- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c index a9d44cee4364..fb09e1ac785e 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c @@ -178,8 +178,7 @@ snmptool_init(struct snmp_toolinfo *snmptoolctx) warn("malloc() failed"); return (-1); } - if (slen > 0) - strlcpy(snmptoolctx->passwd, str, slen + 1); + strlcpy(snmptoolctx->passwd, str, slen + 1); } return (0);