Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jarkko Sakkinen <jarkko.sakkinen@tuni.fi>
To:     linux-integrity@vger.kernel.org, Peter Huewe <peterhuewe@gmx.de>,
        Jarkko Sakkinen <jarkko@kernel.org>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Stefan Berger <stefanb@linux.vnet.ibm.com>
Cc:     Jarkko Sakkinen <jarkko.sakkinen@tuni.fi>, stable@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] tpm_vtpm_proxy: fix race condition in /dev/vtpmx creation
Date:   Sat, 13 May 2023 20:28:18 +0300
Message-Id: <20230513172818.752712-1-jarkko.sakkinen@tuni.fi>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

/dev/vtpmx is made visible before the workqueue exist, which can lead
memory corruption in the worst case, if workqueue is used before it has
been fully initialized. Address this by changing the call order.

Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Fixes: 6f99612e2500 ("tpm: Proxy driver for supporting multiple emulated TPMs")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@tuni.fi>
---
 drivers/char/tpm/tpm_vtpm_proxy.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index 5c865987ba5c..ef1367cf2f10 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -50,7 +50,7 @@ struct proxy_dev {
 /* all supported flags */
 #define VTPM_PROXY_FLAGS_ALL  (VTPM_PROXY_FLAG_TPM2)
 
-static struct workqueue_struct *workqueue;
+static struct workqueue_struct *vtpm_workqueue;
 
 static void vtpm_proxy_delete_device(struct proxy_dev *proxy_dev);
 
@@ -478,7 +478,7 @@ static void vtpm_proxy_work_stop(struct proxy_dev *proxy_dev)
  */
 static inline void vtpm_proxy_work_start(struct proxy_dev *proxy_dev)
 {
-	queue_work(workqueue, &proxy_dev->work);
+	queue_work(vtpm_workqueue, &proxy_dev->work);
 }
 
 /*
@@ -697,30 +697,24 @@ static int __init vtpm_module_init(void)
 {
 	int rc;
 
-	rc = vtpmx_init();
-	if (rc) {
-		pr_err("couldn't create vtpmx device\n");
+	vtpm_workqueue = create_workqueue("tpm-vtpm");
+	if (!vtpm_workqueue) {
+		rc = -ENOMEM;
 		return rc;
 	}
 
-	workqueue = create_workqueue("tpm-vtpm");
-	if (!workqueue) {
-		pr_err("couldn't create workqueue\n");
-		rc = -ENOMEM;
-		goto err_vtpmx_cleanup;
+	rc = vtpmx_init();
+	if (rc) {
+		vtpmx_cleanup();
+		return rc;
 	}
 
 	return 0;
-
-err_vtpmx_cleanup:
-	vtpmx_cleanup();
-
-	return rc;
 }
 
 static void __exit vtpm_module_exit(void)
 {
-	destroy_workqueue(workqueue);
+	destroy_workqueue(vtpm_workqueue);
 	vtpmx_cleanup();
 }
 
-- 
2.39.2