From nobody Sun Oct 11 01:06:43 2026 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 4j2Mr353Flz6w8Mh for ; Sun, 11 Oct 2026 01:06:43 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2Mr33pqSz3Gtn for ; Sun, 11 Oct 2026 01:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791680803; 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=4qQldISXdseGhAhr1vHq0JWC3PmA+R7C3UzwhxrEErw=; b=aSCIQdkNRE3HmbigMxsSKLmzhzIPKbwZ73XXkyUj72/UIm/Tek9xlSgiCnMUt2KMnqgFWB hdBtyuIVeQCwx88I2+w+OnM/oiNtQKGQ/vxPptrPYBbapksOQxa+LqTam10pp70w1wLDUe 96yQsGDXIJnuOhvY9m1sZ+4qB4OqQYTbq8trmFOFh57V6kx1ouRlHI5r8KG1rmxfRAK9v6 6OMuDaAsIHYzH/MjFJW8BAbBMeBlPjh2tvb0k3/WFaTFybs/6CGfKNYOJcvxTpMAI2BC5U /PSQ1TR572ByVjw6VstCrJK6rIIpkv1k+wp1U66CjX5VKsWMrlTxESmUQgZF1w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791680803; b=gocXRiS8cGIKlEHo03nfjHxzXMynAxMi78SKHLzzPldeyjgwEhp6wIXZjbqWN5zbpsNTcQ qoeStRKI3xm3d2ndmCl7fKvdn0TLI19vG1mDULbz7fS75kV8KkHsFNPaOuEuC+Orco5Fdo 0xWw5AcJZqkzCq2XQ9sDgHspCiUnDv4zjM/2+1DuZ+cM3m/+bEaJJj5J8jkX7tkc4/V+ph 5uxopWq6BXejdboydDf6FStM6p2i803GPJ1foy1uSehErsBxJsX869x1sBvSib+8XmRzQM 34tyEJFlxgVv4cD2xDsxyxh1BHyE+siBM9iVkRGMFvmH0Hpq8O3k4mhH1O2OhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791680803; 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=4qQldISXdseGhAhr1vHq0JWC3PmA+R7C3UzwhxrEErw=; b=W5ccbEWOTQnXJGIlUIunIA+MWHNoCQjreWndvTiLmDg9mPGfJ2YivNx3GPf7T59yljSLFQ H5f4DbM3HM4p6eryZCfELTc0dCdCUCjsQ1qghrAQXsPoLWSJakepTBIDNTPzEpLbGXvg2P oNKQj/ogkSGYBGTtp3nN5EMi/T9sv4FcmoTbLHaA/g5gQiB7XkzLY6BRJTy0m82IZMDt5n expnG6jiwFBt8GE8xoTztA5wcvs1ijgeC4HYDIvZPVUd7phgwf8D4Y4NemqSmvi9wRqS21 Fs5q0AZhKvUyWWF381ROrEY1Z22/DkAGwZeq1hdi1kmZjXrgTvlvb4+kp3DXJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j2Mr32sJXzJLP for ; Sun, 11 Oct 2026 01:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32ad1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 01:06:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2f85c15b52e8 - stable/15 - tpm20: Initialize common state before testing TIS interrupts List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2f85c15b52e812f68280ab3eea0af49389465c48 Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 01:06:43 +0000 Message-Id: <6acae123.32ad1.61887745@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2f85c15b52e812f68280ab3eea0af49389465c48 commit 2f85c15b52e812f68280ab3eea0af49389465c48 Author: Kevin Bowling AuthorDate: 2026-08-26 10:51:58 +0000 Commit: Kevin Bowling CommitDate: 2026-10-11 01:06:34 +0000 tpm20: Initialize common state before testing TIS interrupts The TIS attach path tested its interrupt by transmitting GetRandom before tpm20_init() allocated the internal command buffer. A TPM2 FIFO device with a usable IRQ could therefore dereference a null internal_priv. Initialize the common TPM2 state before running the interrupt test. Make common cleanup safe for partially initialized devices and leave cleanup to the attachment after tpm20_init() fails, avoiding duplicate release of the lock, command buffer, and random-source state. Clear the IRQ resource pointer after releasing it when interrupt handler setup fails so the later polling-mode detach does not release it twice. Free the internal command allocation through its object pointer rather than relying on its embedded buffer being the first structure member. Reviewed by: kevans Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59196 (cherry picked from commit a0da653aaeae313479f2ab37d0faca483f530fa6) --- sys/dev/tpm/tpm20.c | 19 ++++++++++++++----- sys/dev/tpm/tpm20.h | 1 + sys/dev/tpm/tpm_tis_core.c | 14 +++++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index 22189d112656..20521b2ed361 100644 --- a/sys/dev/tpm/tpm20.c +++ b/sys/dev/tpm/tpm20.c @@ -157,7 +157,7 @@ tpm20_priv_dtor(void *data) { struct tpm_priv *priv = data; - free(priv->buf, M_TPM20); + free(priv, M_TPM20); } int @@ -209,7 +209,7 @@ tpm20_init(struct tpm_sc *sc) args.mda_si_drv1 = sc; result = make_dev_s(&args, &sc->sc_cdev, TPM_CDEV_NAME); if (result != 0) - tpm20_release(sc); + return (result); #if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM random_source_register(&random_tpm); @@ -217,6 +217,7 @@ tpm20_init(struct tpm_sc *sc) tpm20_harvest, sc); taskqueue_enqueue_timeout(taskqueue_thread, &sc->harvest_task, 0); #endif + sc->common_initialized = true; return (result); @@ -226,16 +227,24 @@ void tpm20_release(struct tpm_sc *sc) { + if (!sc->common_initialized) + goto out; #if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM if (device_is_attached(sc->dev)) taskqueue_drain_timeout(taskqueue_thread, &sc->harvest_task); random_source_deregister(&random_tpm); #endif - - tpm20_priv_dtor(sc->internal_priv); + sc->common_initialized = false; +out: + if (sc->internal_priv != NULL) { + tpm20_priv_dtor(sc->internal_priv); + sc->internal_priv = NULL; + } sx_destroy(&sc->dev_lock); - if (sc->sc_cdev != NULL) + if (sc->sc_cdev != NULL) { destroy_dev(sc->sc_cdev); + sc->sc_cdev = NULL; + } } int diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index a004bdea9e06..7570812219b9 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -128,6 +128,7 @@ struct tpm_sc { void *intr_cookie; int intr_type; /* Current event type */ bool interrupts; + bool common_initialized; struct tpm_priv *internal_priv; diff --git a/sys/dev/tpm/tpm_tis_core.c b/sys/dev/tpm/tpm_tis_core.c index f49a1f982e82..762aa1f7fd75 100644 --- a/sys/dev/tpm/tpm_tis_core.c +++ b/sys/dev/tpm/tpm_tis_core.c @@ -120,17 +120,21 @@ tpmtis_attach(device_t dev) result = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, NULL, tpmtis_intr_handler, sc, &sc->intr_cookie); if (result != 0) { - bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); + if (bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, + sc->irq_res) == 0) + sc->irq_res = NULL; goto skip_irq; } - tpmtis_setup_intr(sc); - skip_irq: result = tpm20_init(sc); - if (result != 0) + if (result != 0) { tpmtis_detach(dev); + return (result); + } + if (sc->intr_cookie != NULL) + tpmtis_setup_intr(sc); - return (result); + return (0); } static int