From owner-dev-commits-src-all@freebsd.org Fri Jan 8 18:32:31 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D1F714D23F8; Fri, 8 Jan 2021 18:32:31 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DCBXv5dsrz4m9J; Fri, 8 Jan 2021 18:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B466827D46; Fri, 8 Jan 2021 18:32:31 +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 108IWVmA056761; Fri, 8 Jan 2021 18:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 108IWVU9056760; Fri, 8 Jan 2021 18:32:31 GMT (envelope-from git) Date: Fri, 8 Jan 2021 18:32:31 GMT Message-Id: <202101081832.108IWVU9056760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e65e4e61f530 - main - vmd: Clean up resources properly when vmd_attach() fails 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/main X-Git-Reftype: branch X-Git-Commit: e65e4e61f5302ddbba3b2a8c2186548072ba49ad Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2021 18:32:31 -0000 The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e65e4e61f5302ddbba3b2a8c2186548072ba49ad commit e65e4e61f5302ddbba3b2a8c2186548072ba49ad Author: Mark Johnston AuthorDate: 2021-01-08 18:32:05 +0000 Commit: Mark Johnston CommitDate: 2021-01-08 18:32:05 +0000 vmd: Clean up resources properly when vmd_attach() fails - Free the resource container by calling rman_fini().[1] - Call device_delete_child() if device_probe_and_attach() fails. Reported by: nc [1] MFC after: 2 weeks --- sys/dev/vmd/vmd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 2cc6f45bed9e..616fd4c8373e 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -101,6 +101,9 @@ vmd_free(struct vmd_softc *sc) int i; struct vmd_irq_handler *elm, *tmp; + if (sc->vmd_bus.rman.rm_end != 0) + rman_fini(&sc->vmd_bus.rman); + #ifdef TASK_QUEUE_INTR if (sc->vmd_irq_tq != NULL) { taskqueue_drain(sc->vmd_irq_tq, &sc->vmd_irq_task); @@ -334,10 +337,10 @@ vmd_attach(device_t dev) snprintf(buf, sizeof(buf), "%s bus numbers", device_get_nameunit(dev)); bus->rman.rm_descr = strdup(buf, M_DEVBUF); error = rman_init(&bus->rman); - if (error) { device_printf(dev, "Failed to initialize %s bus number rman\n", device_get_nameunit(dev)); + bus->rman.rm_end = 0; goto fail; } @@ -410,7 +413,6 @@ vmd_attach(device_t dev) } sc->vmd_child = device_add_child(dev, NULL, -1); - if (sc->vmd_child == NULL) { device_printf(dev, "Failed to attach child\n"); goto fail; @@ -418,7 +420,8 @@ vmd_attach(device_t dev) error = device_probe_and_attach(sc->vmd_child); if (error) { - device_printf(dev, "Failed to add probe child\n"); + device_printf(dev, "Failed to add probe child: %d\n", error); + (void)device_delete_child(dev, sc->vmd_child); goto fail; } @@ -444,9 +447,6 @@ vmd_detach(device_t dev) if (err) return (err); } - if (sc->vmd_bus.rman.rm_end != 0) - rman_fini(&sc->vmd_bus.rman); - vmd_free(sc); return (0); }