From nobody Thu Jan 26 20:27:18 2023 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 4P2sh70119z3btKq; Thu, 26 Jan 2023 20:27:19 +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 4P2sh65yRQz3RLG; Thu, 26 Jan 2023 20:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674764838; 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=hDFFmp/1G3at1DS4B4ekwu4FIW9NB+2Y2MZLF0LJY3c=; b=BfORg7mVl+R9MDtButrSrtafzUOW2WlvbL/A7WWoiDNMMttKm9tkU4sr82yvvC9Hq7n6A7 61XsZPIBG1p2tjfzgDW2eAEicSsSUDcsu65OLr1olfqteEuAznE+kguKkc3iKx34quqCG5 PGr62REKlYt5T7TmbFv/7Qa/w8Mujlcytu8M3w+kGHQweeHMYSAqvW6vCmbH62VwU70XmK 5BUGkMRKPxo/t+K3cMlmbndzRFzH7eu1abGAOCemVMbaX543069ABwwIedxjBDC4JFFc3r o214HkeORIDeJX/sT2ygWegdEbHq4fbnMJpZ5Uy9iaeEdJ7UvdI3JRY235/HZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674764838; 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=hDFFmp/1G3at1DS4B4ekwu4FIW9NB+2Y2MZLF0LJY3c=; b=Zl5Vo/avfOGf4qElzAVtvfBnQS7O1U9SyrrGdaUiVTq0PHrcwhXSl65EexIzajIKqBomNf V0Sb9ufabdOOxSKEZFmgAXe19CkXfTa995FrVN3Ok5S1MmG/RciojIs2iRhUsnNsRCJyEa 8y6cqVpngk3HlAGrmcW7SJUBEx/NKOY0SyS64lRO1NlsEacfWM5NLD1s7qF5npx29qUEmX O3DcavWlLyJGSkQS/p4WBmQjha76Ocp5pPaek44LMjCC2ebuycv6gm9gK31a5z/BuSPRp+ v9eGH44jPjBZuSE83rB3QnlYrMugMnB3vBU2ME5DqkcAIdTFe8yvTXJh+fOcyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674764838; a=rsa-sha256; cv=none; b=lVh1Hz2w8EQ5AcfsJC/ylkQUXYyp0eD7zqnN/5CZ/eDtIrR2M5+7lgZ4HTTMqbOsay588J BMzypWGPYbvbh04NKoqj3XlAU1+jtTgcC095PetKXz00joeiY7vKQRoA+xs78xb/fgzPnx MPVmy1+sojknQSPjVtG0C7XrHZitvZEqjTJfXEFoe8gl0TQN4eYWume515b3zYspuvLacu qqjZOu2tM8r2sAFxig332mZiJcdZabvj+rPHS+jKvCDSKT7S8cdk/+mKQQifw9A328K+hd aK6QyDUYrhwMvYOvdZAyZJ5gU/ruunn9SBFjvvlj7PpWxfCNuGL1j3SHmsPmkA== 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 4P2sh653cCzjgX; Thu, 26 Jan 2023 20:27:18 +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 30QKRIe7065002; Thu, 26 Jan 2023 20:27:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QKRI0I065001; Thu, 26 Jan 2023 20:27:18 GMT (envelope-from git) Date: Thu, 26 Jan 2023 20:27:18 GMT Message-Id: <202301262027.30QKRI0I065001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 225443828ec6 - stable/13 - bhyve: Avoid passing a possible garbage pointer to free(). 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 225443828ec69c7013666bf98a785bbf8b1036c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=225443828ec69c7013666bf98a785bbf8b1036c2 commit 225443828ec69c7013666bf98a785bbf8b1036c2 Author: John Baldwin AuthorDate: 2022-11-29 01:10:30 +0000 Commit: John Baldwin CommitDate: 2023-01-26 20:24:14 +0000 bhyve: Avoid passing a possible garbage pointer to free(). All of the error paths in pci_vtcon_sock_add free the sock pointer. However, sock is not initialized until part way through the function. An early error would pass stack garbage to free(). Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37491 (cherry picked from commit bc928800723b65daa9b005bec4ffd8ad8c781a09) --- usr.sbin/bhyve/pci_virtio_console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_virtio_console.c b/usr.sbin/bhyve/pci_virtio_console.c index 44d0da720226..46005d155f49 100644 --- a/usr.sbin/bhyve/pci_virtio_console.c +++ b/usr.sbin/bhyve/pci_virtio_console.c @@ -273,7 +273,7 @@ static int pci_vtcon_sock_add(struct pci_vtcon_softc *sc, const char *port_name, const nvlist_t *nvl) { - struct pci_vtcon_sock *sock; + struct pci_vtcon_sock *sock = NULL; struct sockaddr_un sun; const char *name, *path; char *cp, *pathcopy;