From nobody Fri Jun 19 12:03:40 2026 X-Original-To: dev-commits-src-main@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 4ghbpj1Dtcz6jBH6 for ; Fri, 19 Jun 2026 12:03:41 +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 4ghbph5sJJz3l2F for ; Fri, 19 Jun 2026 12:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781870620; 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=WcJqQgfoCuUguJx4u+Nq2bZRRt+0Qpfdwb//eXL+xiIH2E8Fn2xPINoHEqEnQ1NhUv6Rhb kyqlyOHNMV6Cxuy8BJrJAKZPx5rngUDPzpU65XzbYmo4yNeqyxeTJQa9MweJJKD62SCaBq 6twTlIiWNY0Wxe4Y0VKWgNL8o1vXyFxSXjF3963LYZ3FDJqiJajTX9fZ0fQLcrBzLjSmbs f6rLb915Er6DbgquNx5PZ4nCYSM5PC9uvzO73o8Z7xPWzh018coXIoPYVs3zPnooHUe4qn w8slQ0DF+g47GgsKihnpr8Nxn/CpVcBa5gtS0vWOMM+eWjj6vEmPEEIOmhxwLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781870620; a=rsa-sha256; cv=none; b=jHW/GB/hfzHUnya7Xr0FO5QhqNvJQY8ZjZ0YW3JfK8b2obWN7lMmZznbwQgZp6nkKL5ARO R3wA/7J2BHtxF14YlV40SsWvgwO//3hBWf04IYxKh+V4mNLkoiB5CODUKJH8Ublz9C3TVA Z2z2jm1b4oso7Fwt+rnlH+sn6LgypeIgw42wQWF5gkWVKbdI44nC5P286acuoKbdPIW6In pjQghV7OiukAcBLI+VH31pkdq4UInKG3CQNjeyK+UfX8Gw/BFE3qMomkhA/f0aFUHM9dV5 0bPd+p+NToDuybBkbh/AVaX6b9Xhgc2Ry1AU0I2XF3V/MGPSWgTVcaq6mUUciQ== 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=1781870620; 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=kxU7S1NQVP5hNs+RzKP4kQTWdSD6lUmrWxsn0E761yjWXcM9SFR6jz8ypsnIaAssputMft Qx+ZWhHgTpc5nTkQ5zKM63Ns4T5HRj0VpOYaEVGZKWvDDdlLQVfPpyALSzuoxQfL/+rNl4 VpAggIW0Sl7ajQG+WNcl4P11EODWXnm2EGtDohu6tDGlr1dQHk4NDtZfkx+raB0ucZXCeP b+SphVYR9f3+vUp0MbY+G2gyyJ55oU4NHjOFILaWGyYWSKSyksQ4clfoVDnCXWSlbwJQQ1 i1pWY2Rs6p97YkiELVSrCG+io/HJTYdYsfpTiyzORuAW4cPEMG6Gjc2yoQiIfw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ghbph4X1NzlRw for ; Fri, 19 Jun 2026 12:03:40 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);