From: stefanb@linux.vnet.ibm.com (Stefan Berger)
To: linux-security-module@vger.kernel.org
Subject: [PATCH 3/3] tpm: vtpm_proxy: Add ioctl to request locality prepended to command
Date: Thu, 20 Apr 2017 07:58:58 -0400 [thread overview]
Message-ID: <10c67f88-35cc-be0e-9acf-e85c9e94d790@linux.vnet.ibm.com> (raw)
In-Reply-To: <1492442371-30252-4-git-send-email-stefanb@linux.vnet.ibm.com>
On 04/17/2017 11:19 AM, Stefan Berger wrote:
> 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 | 16 ++++++++++++----
> include/uapi/linux/vtpm_proxy.h | 4 +++-
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
> index bf59426..5f34973 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;
There 'return' statement of this function needs to say 'return len +
offset'. So I'll resubmit a V2 for that.
Apart from that, any comments?
Stefan
>
> 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,
> };
>
> /**
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: tpmdd-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org
Cc: jgunthorpe@obsidianresearch.com
Subject: Re: [PATCH 3/3] tpm: vtpm_proxy: Add ioctl to request locality prepended to command
Date: Thu, 20 Apr 2017 07:58:58 -0400 [thread overview]
Message-ID: <10c67f88-35cc-be0e-9acf-e85c9e94d790@linux.vnet.ibm.com> (raw)
In-Reply-To: <1492442371-30252-4-git-send-email-stefanb@linux.vnet.ibm.com>
On 04/17/2017 11:19 AM, Stefan Berger wrote:
> 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 | 16 ++++++++++++----
> include/uapi/linux/vtpm_proxy.h | 4 +++-
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
> index bf59426..5f34973 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;
There 'return' statement of this function needs to say 'return len +
offset'. So I'll resubmit a V2 for that.
Apart from that, any comments?
Stefan
>
> 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,
> };
>
> /**
next prev parent reply other threads:[~2017-04-20 11:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-17 15:19 [PATCH 0/3] Extend the vTPM proxy driver to pass locality to emulator Stefan Berger
2017-04-17 15:19 ` Stefan Berger
2017-04-17 15:19 ` [PATCH 1/3] tpm: vtpm_proxy: Add ioctl to get supported flags Stefan Berger
2017-04-17 15:19 ` Stefan Berger
2017-04-17 15:19 ` [PATCH 2/3] tpm: vtpm_proxy: Implement request_locality Stefan Berger
2017-04-17 15:19 ` Stefan Berger
2017-04-18 16:47 ` Jason Gunthorpe
2017-04-18 16:47 ` Jason Gunthorpe
2017-04-18 22:41 ` Stefan Berger
2017-04-18 22:41 ` Stefan Berger
2017-04-19 15:35 ` Jarkko Sakkinen
2017-04-19 15:35 ` Jarkko Sakkinen
2017-04-17 15:19 ` [PATCH 3/3] tpm: vtpm_proxy: Add ioctl to request locality prepended to command Stefan Berger
2017-04-17 15:19 ` Stefan Berger
2017-04-20 11:58 ` Stefan Berger [this message]
2017-04-20 11:58 ` Stefan Berger
2017-04-23 12:18 ` [tpmdd-devel] " Jarkko Sakkinen
2017-04-23 12: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=10c67f88-35cc-be0e-9acf-e85c9e94d790@linux.vnet.ibm.com \
--to=stefanb@linux.vnet.ibm.com \
--cc=linux-security-module@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.