| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20181118074832.GG5897@linux.intel.com>
Date: Sun, 18 Nov 2018 09:48:32 +0200
From: Jarkko Sakkinen <jarkko.sakkinen@...ux.intel.com>
To: Tadeusz Struk <tadeusz.struk@...el.com>
Cc: jgg@...pe.ca, linux-integrity@...r.kernel.org,
linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v4 2/2] tpm: add support for partial reads
On Fri, Nov 16, 2018 at 09:51:51AM -0800, Tadeusz Struk wrote:
> Currently to read a response from the TPM device an application needs
> provide big enough buffer for the whole response and read it in one go.
> The application doesn't know how big the response it beforehand so it
> always needs to maintain a 4K buffer and read the max (4K).
> In case if the user of the TSS library doesn't provide big enough
> buffer the TCTI spec says that the library should set the required
> size and return TSS2_TCTI_RC_INSUFFICIENT_BUFFER error code so that the
> application could allocate a bigger buffer and call receive again.
> To make it possible in the TSS library, this requires being able to do
> partial reads from the driver.
> The library would read the 10 bytes header first to get the actual size
> of the response from the header, and then read the rest of the response.
>
> This patch adds support for partial reads, i.e. the user can read the
> response in one or multiple reads, until the whole response is consumed.
> The user can also read only part of the response and ignore
> the rest by issuing a new write to send a new command.
>
> Signed-off-by: Tadeusz Struk <tadeusz.struk@...el.com>
> ---
> The usecase is implemented in this TSS commit:
> https://github.com/tpm2-software/tpm2-tss/commit/ce982f67a67dc08e24683d30b05800648d8a264c
>
> Changes in v4:
> - Use unsigned type for response_pending as it will never be negative.
> - Rebased on top of name change data_pending to transmit_result patch.
>
> Changes in v3:
> - Remove link to usecase implemented in TSS out of the commit message.
> - Update the conddition in tpm_common_poll() to take into account
> the partial_data also.
>
> Changes in v2:
> - Allow writes after only partial response is consumed to maintain
> backwords compatibility.
> ---
> drivers/char/tpm/tpm-dev-common.c | 41 ++++++++++++++++++++++++++++---------
> drivers/char/tpm/tpm-dev.h | 2 ++
> 2 files changed, 33 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c
> index 67a70e2fde7f..0544733e1b6d 100644
> --- a/drivers/char/tpm/tpm-dev-common.c
> +++ b/drivers/char/tpm/tpm-dev-common.c
> @@ -64,6 +64,7 @@ static void tpm_timeout_work(struct work_struct *work)
>
> mutex_lock(&priv->buffer_mutex);
> priv->transmit_result = 0;
> + priv->partial_data = 0;
> memset(priv->data_buffer, 0, sizeof(priv->data_buffer));
> mutex_unlock(&priv->buffer_mutex);
> wake_up_interruptible(&priv->async_wait);
> @@ -90,22 +91,39 @@ ssize_t tpm_common_read(struct file *file, char __user *buf,
> ssize_t ret_size = 0;
> int rc;
>
> - del_singleshot_timer_sync(&priv->user_read_timer);
> - flush_work(&priv->timeout_work);
> mutex_lock(&priv->buffer_mutex);
> + if (priv->transmit_result || priv->partial_data) {
> + if (*off == 0)
> + priv->partial_data = priv->transmit_result;
> +
> + ret_size = min_t(ssize_t, size, priv->partial_data);
> + if (ret_size <= 0) {
When ret_size < 0? Shouldn't this be just "if (!ret_size)"?
> + ret_size = 0;
> + priv->transmit_result = 0;
> + priv->partial_data = 0;
> + goto out;
> + }
>
> - if (priv->transmit_result) {
> - ret_size = min_t(ssize_t, size, priv->transmit_result);
> - if (ret_size > 0) {
> - rc = copy_to_user(buf, priv->data_buffer, ret_size);
> - memset(priv->data_buffer, 0, priv->transmit_result);
> - if (rc)
> - ret_size = -EFAULT;
> + rc = copy_to_user(buf, priv->data_buffer + *off, ret_size);
> + if (rc) {
> + memset(priv->data_buffer, 0, TPM_BUFSIZE);
> + priv->partial_data = 0;
> + ret_size = -EFAULT;
> + } else {
> + memset(priv->data_buffer + *off, 0, ret_size);
> + priv->partial_data -= ret_size;
> + *off += ret_size;
> }
>
> priv->transmit_result = 0;
> }
>
> +out:
> + if (!priv->partial_data) {
> + *off = 0;
> + del_singleshot_timer_sync(&priv->user_read_timer);
> + flush_work(&priv->timeout_work);
> + }
> mutex_unlock(&priv->buffer_mutex);
> return ret_size;
> }
> @@ -150,6 +168,9 @@ ssize_t tpm_common_write(struct file *file, const char __user *buf,
> goto out;
> }
>
> + priv->partial_data = 0;
> + *off = 0;
> +
> /*
> * If in nonblocking mode schedule an async job to send
> * the command return the size.
> @@ -184,7 +205,7 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait)
>
> poll_wait(file, &priv->async_wait, wait);
>
> - if (priv->transmit_result)
> + if (priv->transmit_result || priv->partial_data)
> mask = EPOLLIN | EPOLLRDNORM;
> else
> mask = EPOLLOUT | EPOLLWRNORM;
> diff --git a/drivers/char/tpm/tpm-dev.h b/drivers/char/tpm/tpm-dev.h
> index 3ff1dc9f3d75..714a4419d392 100644
> --- a/drivers/char/tpm/tpm-dev.h
> +++ b/drivers/char/tpm/tpm-dev.h
> @@ -11,6 +11,8 @@ struct file_priv {
>
> /* Holds the resul of the last successful call to tpm_transmit() */
> size_t transmit_result;
> + /* Holds the count how much of the response is still unread */
> + size_t partial_data;
I'm otherwise happy how this look like but why call it partial_data.
You cannot really tell from the name anything about its contents as
data is very abstract term.
BTW, why you need the new variable anyway and not just decrease the
variable where the length is original stored?
/Jarkko
Powered by blists - more mailing lists