tpmdd-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: tpmdd-devel@lists.sourceforge.net,
	linux-security-module@vger.kernel.org,
	jarkko.sakkinen@linux.intel.com
Cc: jgunthorpe@obsidianresearch.com, linux-kernel@vger.kernel.org,
	Stefan Berger <stefanb@linux.vnet.ibm.com>
Subject: [PATCH v2 3/3] tpm: vtpm_proxy: Add ioctl to request locality prepended to command
Date: Fri, 28 Apr 2017 09:02:18 -0400	[thread overview]
Message-ID: <1493384538-27883-4-git-send-email-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <1493384538-27883-1-git-send-email-stefanb@linux.vnet.ibm.com>

Add an ioctl to request that the locality be prepended to every TPM
command.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 drivers/char/tpm/tpm_vtpm_proxy.c | 18 +++++++++++++-----
 include/uapi/linux/vtpm_proxy.h   |  4 +++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index 48b9818..6c90e02 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -52,7 +52,8 @@ struct proxy_dev {
 };
 
 /* all supported flags */
-#define VTPM_PROXY_FLAGS_ALL  (VTPM_PROXY_FLAG_TPM2)
+#define VTPM_PROXY_FLAGS_ALL  (VTPM_PROXY_FLAG_TPM2 | \
+			       VTPM_PROXY_FLAG_PREPEND_LOCALITY)
 
 static struct workqueue_struct *workqueue;
 
@@ -77,8 +78,9 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf,
 				    size_t count, loff_t *off)
 {
 	struct proxy_dev *proxy_dev = filp->private_data;
-	size_t len;
-	int sig, rc;
+	size_t len, offset = 0;
+	int sig, rc = 0;
+	uint8_t locality;
 
 	sig = wait_event_interruptible(proxy_dev->wq,
 		proxy_dev->req_len != 0 ||
@@ -102,7 +104,13 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf,
 		return -EIO;
 	}
 
-	rc = copy_to_user(buf, proxy_dev->buffer, len);
+	if (proxy_dev->flags & VTPM_PROXY_FLAG_PREPEND_LOCALITY) {
+		locality = proxy_dev->chip->locality;
+		offset = sizeof(locality);
+		rc = copy_to_user(buf, &locality, offset);
+	}
+	if (!rc)
+		rc = copy_to_user(&buf[offset], proxy_dev->buffer, len);
 	memset(proxy_dev->buffer, 0, len);
 	proxy_dev->req_len = 0;
 
@@ -114,7 +122,7 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf,
 	if (rc)
 		return -EFAULT;
 
-	return len;
+	return offset + len;
 }
 
 /**
diff --git a/include/uapi/linux/vtpm_proxy.h b/include/uapi/linux/vtpm_proxy.h
index 83e64e7..512a29e 100644
--- a/include/uapi/linux/vtpm_proxy.h
+++ b/include/uapi/linux/vtpm_proxy.h
@@ -22,9 +22,11 @@
 /**
  * enum vtpm_proxy_flags - flags for the proxy TPM
  * @VTPM_PROXY_FLAG_TPM2:	the proxy TPM uses TPM 2.0 protocol
+ * @VTPM_PROXY_PREPEND_LOCALITY:locality byte prepended on each command
  */
 enum vtpm_proxy_flags {
-	VTPM_PROXY_FLAG_TPM2	= 1,
+	VTPM_PROXY_FLAG_TPM2			= 1,
+	VTPM_PROXY_FLAG_PREPEND_LOCALITY	= 2,
 };
 
 /**
-- 
2.4.3


  parent reply	other threads:[~2017-04-28 13:02 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-28 13:02 [PATCH v2 0/3] Extend the vTPM proxy driver to pass locality to emulator Stefan Berger
     [not found] ` <1493384538-27883-1-git-send-email-stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2017-04-28 13:02   ` [PATCH v2 1/3] tpm: vtpm_proxy: Add ioctl to get supported flags Stefan Berger
2017-05-03 22:31     ` Jarkko Sakkinen
2017-04-28 13:02   ` [PATCH v2 2/3] tpm: vtpm_proxy: Implement request_locality Stefan Berger
2017-04-29 11:58   ` [PATCH v2 0/3] Extend the vTPM proxy driver to pass locality to emulator Jarkko Sakkinen
2017-04-28 13:02 ` Stefan Berger [this message]
     [not found]   ` <1493384538-27883-4-git-send-email-stefanb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2017-04-29  7:02     ` [PATCH v2 3/3] tpm: vtpm_proxy: Add ioctl to request locality prepended to command kbuild test robot
2017-05-03 22:37   ` Jarkko Sakkinen
     [not found]     ` <20170503223747.zefh76m4youqlgje-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-05-03 23:40       ` Stefan Berger
     [not found]         ` <40cd7d48-f6d1-39f4-99a3-916c7cdbb636-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2017-05-04  9:17           ` Jarkko Sakkinen
2017-05-04 11:14             ` Stefan Berger
2017-05-04 18:40               ` Jarkko Sakkinen
     [not found]                 ` <20170504184007.46efvqyqwxjkzwuq-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-05-04 20:03                   ` Stefan Berger
2017-05-08 23:43                     ` Jarkko Sakkinen
     [not found]                       ` <20170508234328.iydmoverh5z4nwco-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-05-09 15:49                         ` Stefan Berger
2017-05-10 12:47                           ` Jarkko Sakkinen
2017-05-10 13:20                             ` Stefan Berger
     [not found]                               ` <2c20fc62-938a-a6da-dbb2-70711b84996d-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2017-05-10 18:33                                 ` Jarkko Sakkinen
2017-05-03 22:38 ` [PATCH v2 0/3] Extend the vTPM proxy driver to pass locality to emulator Jarkko Sakkinen
2017-05-03 23:42   ` Stefan Berger
     [not found]     ` <72bacff5-5213-b114-ebf4-6e3fe7284bdc-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2017-05-04  9:18       ` Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1493384538-27883-4-git-send-email-stefanb@linux.vnet.ibm.com \
    --to=stefanb@linux.vnet.ibm.com \
    --cc=jarkko.sakkinen@linux.intel.com \
    --cc=jgunthorpe@obsidianresearch.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=tpmdd-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).