Add the retrieval of TPM 1.2 durations and timeouts. Since this requires
the startup of the TPM, do this for TPM 1.2 and TPM 2.
Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>
CC: linux-kernel@xxxxxxxxxxxxxxx
CC: linux-doc@xxxxxxxxxxxxxxx
CC: linux-api@xxxxxxxxxxxxxxx
---
drivers/char/tpm/tpm_vtpm.c | 94 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 85 insertions(+), 9 deletions(-)
diff --git a/drivers/char/tpm/tpm_vtpm.c b/drivers/char/tpm/tpm_vtpm.c
index 245ce91..b048898 100644
--- a/drivers/char/tpm/tpm_vtpm.c
+++ b/drivers/char/tpm/tpm_vtpm.c
@@ -45,8 +45,11 @@ struct vtpm_dev {
size_t req_len; /* length of queued TPM request */
size_t resp_len; /* length of queued TPM response */
u8 buffer[TPM_BUFSIZE]; /* request/response buffer */
+
+ struct work_struct work; /* task that retrieves TPM timeouts */
};
+static struct workqueue_struct *workqueue;
static void vtpm_delete_device(struct vtpm_dev *vtpm_dev);
@@ -67,6 +70,15 @@ static ssize_t vtpm_fops_read(struct file *filp, char __user *buf,
size_t len;
int sig, rc;
+ mutex_lock(&vtpm_dev->buf_lock);
+
+ if (!(vtpm_dev->state & STATE_OPENED_FLAG)) {
+ mutex_unlock(&vtpm_dev->buf_lock);
+ return -EPIPE;
+ }
+
+ mutex_unlock(&vtpm_dev->buf_lock);
+
sig = wait_event_interruptible(vtpm_dev->wq, vtpm_dev->req_len != 0);
if (sig)
return -EINTR;
@@ -110,6 +122,11 @@ static ssize_t vtpm_fops_write(struct file *filp, const char __user *buf,
mutex_lock(&vtpm_dev->buf_lock);
+ if (!(vtpm_dev->state & STATE_OPENED_FLAG)) {
+ mutex_unlock(&vtpm_dev->buf_lock);
+ return -EPIPE;
+ }
+
if (count > sizeof(vtpm_dev->buffer) ||
!(vtpm_dev->state & STATE_WAIT_RESPONSE_FLAG)) {
mutex_unlock(&vtpm_dev->buf_lock);
@@ -154,6 +171,9 @@ static unsigned int vtpm_fops_poll(struct file *filp, poll_table *wait)
if (vtpm_dev->req_len)
ret |= POLLIN | POLLRDNORM;
+ if (!(vtpm_dev->state & STATE_OPENED_FLAG))
+ ret |= POLLHUP;
+
mutex_unlock(&vtpm_dev->buf_lock);
return ret;
@@ -341,6 +361,54 @@ static const struct tpm_class_ops vtpm_tpm_ops = {
};
/*
+ * Code related to the startup of the TPM 2 and startup of TPM 1.2 +
+ * retrieval of timeouts and durations.
+ */
+
+static void vtpm_dev_work(struct work_struct *work)
+{
+ struct vtpm_dev *vtpm_dev = container_of(work, struct vtpm_dev, work);
+ int rc;
+
+ if (vtpm_dev->flags & VTPM_FLAG_TPM2)
+ rc = tpm2_startup(vtpm_dev->chip, TPM2_SU_CLEAR);
+ else
+ rc = tpm_get_timeouts(vtpm_dev->chip);
+
+ if (rc)
+ goto err;
+
+ rc = tpm_chip_register(vtpm_dev->chip);
+ if (rc)
+ goto err;
+
+ return;
+
+err:
+ vtpm_fops_undo_open(vtpm_dev);
+}
+
+/*
+ * vtpm_dev_work_stop: make sure the work has finished
+ *
+ * This function is useful when user space closed the fd
+ * while the driver still determines timeouts.
+ */
+static void vtpm_dev_work_stop(struct vtpm_dev *vtpm_dev)
+{
+ vtpm_fops_undo_open(vtpm_dev);
+ flush_work(&vtpm_dev->work);
+}
+
+/*
+ * vtpm_dev_work_start: Schedule the work for TPM 1.2 & 2 initialization
+ */
+static inline void vtpm_dev_work_start(struct vtpm_dev *vtpm_dev)
+{
+ queue_work(workqueue, &vtpm_dev->work);
+}
+
+/*
* Code related to creation and deletion of device pairs
*/
static struct vtpm_dev *vtpm_create_vtpm_dev(void)
@@ -355,6 +423,7 @@ static struct vtpm_dev *vtpm_create_vtpm_dev(void)
init_waitqueue_head(&vtpm_dev->wq);
mutex_init(&vtpm_dev->buf_lock);
+ INIT_WORK(&vtpm_dev->work, vtpm_dev_work);
chip = tpm_chip_alloc(NULL, &vtpm_tpm_ops);
if (IS_ERR(chip)) {
@@ -424,9 +493,7 @@ static struct file *vtpm_create_device(
if (vtpm_dev->flags & VTPM_FLAG_TPM2)
vtpm_dev->chip->flags |= TPM_CHIP_FLAG_TPM2;
- rc = tpm_chip_register(vtpm_dev->chip);
- if (rc)
- goto err_vtpm_fput;
+ vtpm_dev_work_start(vtpm_dev);
vtpm_new_dev->fd = fd;
vtpm_new_dev->major = MAJOR(vtpm_dev->chip->dev.devt);
@@ -435,12 +502,6 @@ static struct file *vtpm_create_device(
return file;
-err_vtpm_fput:
- put_unused_fd(fd);
- fput(file);
-
- return ERR_PTR(rc);
-
err_put_unused_fd:
put_unused_fd(fd);
@@ -455,6 +516,8 @@ err_delete_vtpm_dev:
*/
static void vtpm_delete_device(struct vtpm_dev *vtpm_dev)
{
+ vtpm_dev_work_stop(vtpm_dev);
+
tpm_chip_unregister(vtpm_dev->chip);
vtpm_fops_undo_open(vtpm_dev);
@@ -549,11 +612,24 @@ static int __init vtpm_module_init(void)
return rc;
}
+ workqueue = create_workqueue("tpm-vtpm");
+ if (!workqueue) {
+ pr_err("couldn't create workqueue\n");
+ rc = -ENOMEM;
+ goto err_vtpmx_cleanup;
+ }
+
return 0;
+
+err_vtpmx_cleanup:
+ vtpmx_cleanup();
+
+ return rc;
}
static void __exit vtpm_module_exit(void)
{
+ destroy_workqueue(workqueue);
vtpmx_cleanup();
}
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
