From nobody Fri Jun 19 12:03:40 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 4ghbpq5NWDz6jBSN for ; Fri, 19 Jun 2026 12:03:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ghbpp0h6Bz3l4S for ; Fri, 19 Jun 2026 12:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781870626; 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=JxMgaEwjBOoT5zPcX56O72GeedlNOyyXCMygwlyEHas=; b=Wc1ASDwHLZyOqWVAHb4cTHOODLpLMGWnpSvbXJCI97jJhrQ+9wONp6s3uccASpAb7Hb+tH NXF0mve9igxr4l/av1T2bZnJuB1FbKz6ciNExA1+mEcF8g79x8ulCNThLAZrk7i6Qn4jgr DDCH/Y7wJeS1ITEpyzpcHk9abeVF+RDHynuUFBGceDBarGnh8lB2nrtDz2BW075CIkvYre 5jsnaVBiBTvasLInpAYcR5Ba1M6RK5/o8LZbMtz5OhCNDV+x5edvMrRP+IXA6AGHpKkjgI zpg+VU5w485/R7JiFHtfZI7ISm/ISW9+VTiR4O6aXpGMGGoxKv16cKOGkW44pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781870626; a=rsa-sha256; cv=none; b=spsplBLOoIBDfdnWQOyM6966L1T86VsONDUtVpYnZKWE0ZPunneEOxGh089Q2Guzv5OJnu oX6qjy7GebyWL35JZQzMI9Z44iaBJI8KdsONGMWjOAb+dV+WPsz+3cqoOdR2f6/9paRNrU 5glYd0QKpu5WxLlDe5LE1a6yv0FfF0wQuNpF6JUKRMLHPHxGcc4v3RP5ibkWHUYWJsRid3 KbQCjyPPkWwjTrrZYOWSUQIj/ekOp7Gj0Jt8AXb1/AvZwMcTYfZEFN1843h1LhPGClW5rS 1FUTHeHjM0ntZXkysmjxhAKMUxIoBRJrN3e/KtPhV6xa1ql5vgIymd5qujBy8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781870626; 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=JxMgaEwjBOoT5zPcX56O72GeedlNOyyXCMygwlyEHas=; b=QwYgpaaZ0zAw1/aE2eqs8T/OBtoBGtJxxLAOM5f407cuG/UXB1eACya5QWQwEfbVywFUZ3 +VJ0YDle/rGSYOYBbPAk9q3jmDCNLK2XgmWvinY+J4PCqxDJ7XjNmLypPc94BqRxaOQvtQ tuL8yZKMNzuU+dqD6NRN0s6VyXFSETPVGyu6E9XBzWL2/1yw1x/ApFV5UYjZCV6A+sPM7K m7RIca73V/6R3/93OiJDJd2/N0rvNVZrLkZRcQ7doiJQOR3Nu8fjs7gkQ3n+skKhc58u0k x17c9MfO0tc9fEflgebaWin8uyRye6Ptybax10KehzVJx0sYBLNK9ItDXYENFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ghbpn6kJNzl0N for ; Fri, 19 Jun 2026 12:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 253e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 19 Jun 2026 12:03:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 28ddd11d91f8 - main - bsnmpd/snmp_hostres: fix hrFSTable remoteMountPoint leak 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 List-Id: 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28ddd11d91f860df9b9be485c5b0526c10b4aec1 Auto-Submitted: auto-generated Date: Fri, 19 Jun 2026 12:03:40 +0000 Message-Id: <6a35301c.253e6.fab3f87@gitrepo.freebsd.org> The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=28ddd11d91f860df9b9be485c5b0526c10b4aec1 commit 28ddd11d91f860df9b9be485c5b0526c10b4aec1 Author: Mariusz Zaborski AuthorDate: 2026-06-19 11:58:17 +0000 Commit: Mariusz Zaborski CommitDate: 2026-06-19 11:58:17 +0000 bsnmpd/snmp_hostres: fix hrFSTable remoteMountPoint leak Free the previous value before re-strdup'ing, and initialise remoteMountPoint to NULL in fs_entry_create() so the free() is safe on the newly-created path Observed via a dtrace leak snapshot on 15.0-RELEASE-p4: data leaked = 1983, count = 1683 libc.so.7`malloc+0xa8 snmp_hostres.so.6`fs_tbl_process_statfs_entry+0x276 snmp_hostres.so.6`refresh_storage_tbl+0x502 snmp_hostres.so.6`op_hrStorageTable+0x1a libbsnmp.so.7`0x2a2b1892ba3d libbsnmp.so.7`snmp_getbulk+0x37f Reviewed by: sjg, ngie Differential Revision: https://reviews.freebsd.org/D57604 --- usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c index bdc20d19a372..147522036bf9 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c @@ -205,6 +205,7 @@ fs_entry_create(const char *name) free(entry); return (NULL); } + entry->remoteMountPoint = NULL; entry->index = map->hrIndex; map->entry = entry; @@ -352,6 +353,9 @@ fs_tbl_process_statfs_entry(const struct statfs *fs_p, int32_t storage_idx) (entry = fs_entry_create(fs_p->f_mntonname)) != NULL) { entry->flags |= HR_FS_FOUND; + free(entry->remoteMountPoint); + entry->remoteMountPoint = NULL; + if (!(fs_p->f_flags & MNT_LOCAL)) { /* this is a remote mount */ entry->remoteMountPoint = strdup(fs_p->f_mntfromname);