From nobody Thu Feb 24 17:42:09 2022 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 A6D0219EE09C; Thu, 24 Feb 2022 17:42:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K4Kwd45x7z3lkM; Thu, 24 Feb 2022 17:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645724529; 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=p6Dwlp5iGvtfMrUqqsSRMSyw77Prs4mPt6sMHX+Io6A=; b=tQ5N1Ldng64Ljzwsc55ahL+WIqTwwbH7h3gnQ7QwrZiEFXZxI5xoeoy379tT9SzagVk4M8 UGN7Y/HJWDg3bOG/1RB2PpovEOyyuBXjeDSP+BUpzE8eMRt4XHg6m6qXE4e8Ak6QjBH5cB AR8IK0oqyGIUkkv2Bc1qkhesrdwPc/Qea3minOb9Se9hdICJwZh8iWIenvUks9pghwfNnV ck+nRutGEqQHKDDcEFadpBtC7wPXoSGT/Ic9ToOgKucUbtYzxVpLQuxmG1omXYsXv76FLg Vo7e0bSdvm1jxxcVCokt62UBYaO9NcRWMpcifOTkgaztzS3CLQyZK+u7cVfS2w== 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 6D3351073E; Thu, 24 Feb 2022 17:42:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21OHg9c4019769; Thu, 24 Feb 2022 17:42:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21OHg9IR019768; Thu, 24 Feb 2022 17:42:09 GMT (envelope-from git) Date: Thu, 24 Feb 2022 17:42:09 GMT Message-Id: <202202241742.21OHg9IR019768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: ad3da82996ff - main - bhyve: plug memory leak in topology_parse() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad3da82996ffe8a7959fda4a84374b1907ebb116 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645724529; 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=p6Dwlp5iGvtfMrUqqsSRMSyw77Prs4mPt6sMHX+Io6A=; b=Z2NeSPH1CkMWNA71CgGg6GrxyZgpmAH5tztpVGSP1+exVv/ub/t+494WnxDVsFDvpeYl/d pOIRuSEGnUVeyIvWWAfbnQ9UefEhA98V5JGDI01CvI9KIHrZh/sXZcpTz4pdYIV4+nhpyM V+kO77WZz8JXJYzsy6Ggqp8WJXv4USZHqeNLPFVd82I1tEZwbuDvJ8Ih5lTpywv2qd1uKq 44tM42Z9GNqWstawjMUpGHgk4vPbac+5DFhapmsgU9I6IHgZWMSltgLszrNH7Y2cAO2bed NywlSPuBKpxmfMa0BYYf8P6QIKoPJsf4QZJzTgr2ZYIV5gstPg8ZxdNnQmjQLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645724529; a=rsa-sha256; cv=none; b=tTIfCGY9+DE3kfjEJDBrmKMD+o08+OQUYjwQOxqfXHnAGBWwuASd6Ui6b+Bems1GNblWhk 5AWZTdLU2j1ypWveDDBKcArj/r9+hhxypulXVHQCtLpU4nXsukmZ7PYg0wPRbVhZwQoL19 TnTMYB+cLBar+gjDi3SBa3YNYTNevfAy7uhOqjF6uZ74N+uSlQyOSM2qagGbspafq6oc4R 6l5bo75zw7r/P2OtT1AggArzwe80NzrY9jZvuzoDAbpv8HVv04FJAtDmZ6ZwL3a6kbwU1T uaF45N6uBaEpCnZsydhKsWfxxDPpuFDtU0C6F8wqwhJItr2WjWAqYJfuD9FZIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=ad3da82996ffe8a7959fda4a84374b1907ebb116 commit ad3da82996ffe8a7959fda4a84374b1907ebb116 Author: Andy Fiddaman AuthorDate: 2022-02-24 17:36:41 +0000 Commit: Robert Wing CommitDate: 2022-02-24 17:38:53 +0000 bhyve: plug memory leak in topology_parse() Reviewed by: jhb, rew Differential Revision: https://reviews.freebsd.org/D34301 --- usr.sbin/bhyve/bhyverun.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 21ef18531e63..734239b38a8b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -270,7 +270,7 @@ usage(int code) static int topology_parse(const char *opt) { - char *cp, *str; + char *cp, *str, *tofree; if (*opt == '\0') { set_config_value("sockets", "1"); @@ -280,7 +280,7 @@ topology_parse(const char *opt) return (0); } - str = strdup(opt); + tofree = str = strdup(opt); if (str == NULL) errx(4, "Failed to allocate memory"); @@ -302,11 +302,11 @@ topology_parse(const char *opt) else set_config_value("cpus", cp); } - free(str); + free(tofree); return (0); out: - free(str); + free(tofree); return (-1); }