From nobody Tue Dec 26 02:08:25 2023 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 4SzdV13M1nz55L7Q; Tue, 26 Dec 2023 02:08:25 +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 4SzdV12094z4SPj; Tue, 26 Dec 2023 02:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703556505; 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=7aS1zHhnAEy9mXGJuNWq/ggrb+8mlhS9tS7gyXexUs4=; b=b9fkc9Lpo28j2Ef+UNfDlGgRW3OHjAl1R5syjmFApYA3Xl+RMn08v0QhDBMlateGTl96K3 AO2wTb3KliXtogMJTPNcKO4W1VrTmLJyRu2o1RBx9gam8ONoKnRirJc0v5O789l1zM9TJZ jHVd64pRtEifotr0doCBtO4ZNsS1OZyKaUarsGtFEQ+jZjeqdPNGO1dThvzQHJ/bZ2weXJ j3JVgR+++a4jQ5nujYx0h60uGVKYqQFU+AdXSCj1/gQYN7TaS88HXmWAyP2UXCP46eb8pk sze8r61jRAU3aCNJi6k6hZNZR7ly58ADDFIocxTtyDDNdeYD5FR4RyMJqM3mhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703556505; a=rsa-sha256; cv=none; b=KJWLVa3jSujK3VkwkN74s+xTSQntXQoQC1KXmgc/ZW0uLGXR0neUCHLIYopzJTNzVTFroS /2OH+yadCjVf+9GxB6f5I+8Xc2ejxO71hAXcDudMfdE52RfKxH3dMyp5+NLqaNudxondwR M4ZZaNhPbD/9C/ks54oG9GHpcSjY7iYT0D94k9AHZTU0+JclDz78ByZOXd02FIimzAvVr7 bUDQSh43BqyGBEY/OaVG7vThZ/gpucbTq7EwC4VuNQ6t5qiapDnnxb2mGjwKhfy6BkKZTF lbh/9UiSboYDo08MPjJrfhZPRbKzgqUuioy+jqGtniX560iKwTXfePFl38tFag== 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=1703556505; 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=7aS1zHhnAEy9mXGJuNWq/ggrb+8mlhS9tS7gyXexUs4=; b=puBLUiqYXQTDhWzlsKuJCgsbgHUEM1UwvAh7MMbvkg4EOdrFZR1UEu0hYgPJKhnMLzHKDv 6L2BLJ3mUCd5DoaAYROjzyW8GXRA7zCQh0Wx2aMbImmZR3GTXGIukvID4Aa0t4GRMF7B7D UsY6DGNTr1FaDTDiianqawqwAEFQT1grY+tkBvqRx1cp0jlxPHBTue1c/OIcNu8lkRH2Uw d/l+GNPsMSJ1LYj44AjWUXzQi/S+cH1TIABbeuJ/oTDKBYx1yDJ+/ItrDWm/8USypltNhf s0OyX8K/NpMlt3TUac0T7Ao7feK2L7AqaKIhwmEpI/hEKcj1YwreA0vT1ok9lg== 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 4SzdV10vjWzbhd; Tue, 26 Dec 2023 02:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ28PIN004658; Tue, 26 Dec 2023 02:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ28Pkq004655; Tue, 26 Dec 2023 02:08:25 GMT (envelope-from git) Date: Tue, 26 Dec 2023 02:08:25 GMT Message-Id: <202312260208.3BQ28Pkq004655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 37eb7030a0fb - stable/14 - bhyve: Fix a leak that happens when we fail to load a hostfwd rule 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37eb7030a0fb6543e402799fff2be31645e1dbac Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=37eb7030a0fb6543e402799fff2be31645e1dbac commit 37eb7030a0fb6543e402799fff2be31645e1dbac Author: Mark Johnston AuthorDate: 2023-12-01 14:46:31 +0000 Commit: Mark Johnston CommitDate: 2023-12-25 16:57:14 +0000 bhyve: Fix a leak that happens when we fail to load a hostfwd rule Reported by: Coverity Fixes: c5359e2af5ab ("bhyve: Add a slirp network backend") (cherry picked from commit 1cc96501e58057fba62cdebd514cdc9197d6e97c) --- usr.sbin/bhyve/net_backend_slirp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backend_slirp.c b/usr.sbin/bhyve/net_backend_slirp.c index 1c414f87084c..1d6ed45b90f2 100644 --- a/usr.sbin/bhyve/net_backend_slirp.c +++ b/usr.sbin/bhyve/net_backend_slirp.c @@ -502,8 +502,10 @@ _slirp_init(struct net_backend *be, const char *devname __unused, goto err; while ((rule = strsep(&rules, ";")) != NULL) { error = config_one_hostfwd(priv, rule); - if (error != 0) + if (error != 0) { + free(tofree); goto err; + } } free(tofree); }