From nobody Sat May 09 15:55:03 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 4gCVth621cz6c56c for ; Sat, 09 May 2026 15:55:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gCVth53x1z3ryN for ; Sat, 09 May 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778342108; 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=WXguVpRi4tQSKnyGf+GNTRe07RTFwB/AdF7DIUMBUlU=; b=gexlGpY0NMgaIBk+P0YpzGKEH8kwfVfXL1mT2Gka3pKD8oKLkSLinppxEplms71HJZvnt4 MluyDovJYFzaol+CcAhHcAhZiC2bJe1Wd6EWLEayVKM22nGuQJLfSzTkOX5s6qYKeXLzUl 7AmENimiNxrydrq0kpmriAFtgrSjTwoI6XKDG+xdRfCkKvMf6z0xFOQrArQHNSL0ixhATa kYfdyS28iRwrzO+wTGVYTCg3ZsCsvTxtPkMIq06f0bEg5m82JQKDYwEOK4Yb+teOJGb6oJ 3LXkMJMcHOIqnEF9qetk9WOzsu/zq3alYXWASbhwvUEttBLHg8EsoBP1qnfmpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778342108; a=rsa-sha256; cv=none; b=Sxxd8yfka6EjrswuUSwsBHGFhCASWFitq5iEkMfIV7iAZV4WbZPGGWWCzhy4HhEuqjDrdz daDMpUWqj1EdQUXS7RUwyOT4/BXgcQFK+zm9MKDnGhqH2ZxGQKpFWCKiZzZYJZotqkDT/0 +3NOzglQtBBf9OVFDfvqb7goOP3SHZAx1biBmKitTqDbDP26Msokl6UfAoO0eL8XlyIqE5 IayvgnE/ZGZF7Ez63cVk5RUiksGd+N1iKE3bLVicuz1RFkAznxKgI+pmiqUyw/cG34zVv4 NYeiA7yaas+ozUafde8gxM81wMKDshrvVcrCLoL7N+ga7zLMwGitXhuEt0HOuw== 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=1778342108; 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=WXguVpRi4tQSKnyGf+GNTRe07RTFwB/AdF7DIUMBUlU=; b=eLqFq4BbxapSOAYw+RqRcL5S+iQW4peIUKtzCM7w/rxHbroxJm+ZoVAZyHm2qckPat1XTr CxAtSAkx1Au2+sl46tpc2bvDKNhNHGn32Lfhjek4fbc7oXi6kx/b9P5ynsQ1hNb/MWk/lZ n3J4hAzGwsgx68zcRKiR874o2miovTPGW7ivlJgIOArAac9gJ/FXsr+BAtlBERbhHd116Y lZEFWXlLe6bYfsJ4aaKT4XH64qQ0LZqt7oRKlJxjM4t8bsI1CXbsIZ/cR6FDmgpEMiO6x8 +THT5vfQSYnXlukTYUg0x492IDZefFDPifZgNPqkUeN3qC42FcGbAjnhKRfMbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gCVth4Thzz15Pk for ; Sat, 09 May 2026 15:55:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 336ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 09 May 2026 15:55:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chuck Silvers From: Hartmut Brandt Subject: git: 7906084ba2fd - main - Fix some memory leaks when fetching the mibII. 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: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7906084ba2fd50022f38ce2e8d0bcef212a4ff19 Auto-Submitted: auto-generated Date: Sat, 09 May 2026 15:55:03 +0000 Message-Id: <69ff58d7.336ba.123f34ad@gitrepo.freebsd.org> The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=7906084ba2fd50022f38ce2e8d0bcef212a4ff19 commit 7906084ba2fd50022f38ce2e8d0bcef212a4ff19 Author: Chuck Silvers AuthorDate: 2026-05-09 15:52:14 +0000 Commit: Hartmut Brandt CommitDate: 2026-05-09 15:52:14 +0000 Fix some memory leaks when fetching the mibII. Reviewed by: glebius Sponsored by: Netflix Differential Revision: --- contrib/bsnmp/snmp_mibII/mibII.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c index 59f3836d1ede..4cf4f231facc 100644 --- a/contrib/bsnmp/snmp_mibII/mibII.c +++ b/contrib/bsnmp/snmp_mibII/mibII.c @@ -485,6 +485,7 @@ mib_fetch_ifmib(struct mibif *ifp) syslog(LOG_WARNING, "sysctl linkmib estimate (%s): %m", ifp->name); if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -492,6 +493,7 @@ mib_fetch_ifmib(struct mibif *ifp) } if (len == 0) { if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -500,6 +502,7 @@ mib_fetch_ifmib(struct mibif *ifp) if (ifp->specmiblen != len) { if ((newmib = realloc(ifp->specmib, len)) == NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; goto out; @@ -510,6 +513,7 @@ mib_fetch_ifmib(struct mibif *ifp) if (sysctl(name, nitems(name), ifp->specmib, &len, NULL, 0) == -1) { syslog(LOG_WARNING, "sysctl linkmib (%s): %m", ifp->name); if (ifp->specmib != NULL) { + free(ifp->specmib); ifp->specmib = NULL; ifp->specmiblen = 0; } @@ -546,9 +550,11 @@ mib_fetch_ifmib(struct mibif *ifp) alias_maxlen = MIBIF_ALIAS_SIZE_MAX; /* + * Free any alias memory allocated by a previous call. * Allocate maximum memory for a buffer and later reallocate * to free extra memory. */ + free(ifp->alias); if ((ifp->alias = malloc(alias_maxlen)) == NULL) { syslog(LOG_WARNING, "malloc(%d) failed: %m", (int)alias_maxlen); goto fin;