From patchwork Fri Nov 16 17:51:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tadeusz Struk X-Patchwork-Id: 10686729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D46813BF for ; Fri, 16 Nov 2018 17:51:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42AB928BCE for ; Fri, 16 Nov 2018 17:51:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40BEB2D754; Fri, 16 Nov 2018 17:51:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBB5E2D752 for ; Fri, 16 Nov 2018 17:51:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729213AbeKQEEf (ORCPT ); Fri, 16 Nov 2018 23:04:35 -0500 Received: from mga05.intel.com ([192.55.52.43]:63004 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729198AbeKQEEe (ORCPT ); Fri, 16 Nov 2018 23:04:34 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Nov 2018 09:51:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,240,1539673200"; d="scan'208";a="108894630" Received: from tstruk-mobl1.jf.intel.com ([10.7.196.53]) by orsmga001.jf.intel.com with ESMTP; 16 Nov 2018 09:51:13 -0800 Subject: [PATCH 1/2] tpm: rename data_pending to transmit_result From: Tadeusz Struk To: jarkko.sakkinen@linux.intel.com Cc: jgg@ziepe.ca, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, tadeusz.struk@intel.com Date: Fri, 16 Nov 2018 09:51:13 -0800 Message-ID: <154239067364.2880.13752725056462237016.stgit@tstruk-mobl1.jf.intel.com> User-Agent: StGit/unknown-version MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The file_priv->data_pending name is not adequate as it doesn't contain any data, but the result from the last successful call to tpm_transmit() function, so rename it to transmit_result. Also its type should be size_t instead of ssize_t as it will never be negative. Change it as well. Signed-off-by: Tadeusz Struk --- drivers/char/tpm/tpm-dev-common.c | 20 ++++++++++---------- drivers/char/tpm/tpm-dev.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c index 99b5133a9d05..67a70e2fde7f 100644 --- a/drivers/char/tpm/tpm-dev-common.c +++ b/drivers/char/tpm/tpm-dev-common.c @@ -40,7 +40,7 @@ static void tpm_async_work(struct work_struct *work) tpm_put_ops(priv->chip); if (ret > 0) { - priv->data_pending = ret; + priv->transmit_result = ret; mod_timer(&priv->user_read_timer, jiffies + (120 * HZ)); } mutex_unlock(&priv->buffer_mutex); @@ -63,7 +63,7 @@ static void tpm_timeout_work(struct work_struct *work) timeout_work); mutex_lock(&priv->buffer_mutex); - priv->data_pending = 0; + priv->transmit_result = 0; memset(priv->data_buffer, 0, sizeof(priv->data_buffer)); mutex_unlock(&priv->buffer_mutex); wake_up_interruptible(&priv->async_wait); @@ -94,16 +94,16 @@ ssize_t tpm_common_read(struct file *file, char __user *buf, flush_work(&priv->timeout_work); mutex_lock(&priv->buffer_mutex); - if (priv->data_pending) { - ret_size = min_t(ssize_t, size, priv->data_pending); + 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->data_pending); + memset(priv->data_buffer, 0, priv->transmit_result); if (rc) ret_size = -EFAULT; } - priv->data_pending = 0; + priv->transmit_result = 0; } mutex_unlock(&priv->buffer_mutex); @@ -125,7 +125,7 @@ ssize_t tpm_common_write(struct file *file, const char __user *buf, * tpm_read or a user_read_timer timeout. This also prevents split * buffered writes from blocking here. */ - if (priv->data_pending != 0 || priv->command_enqueued) { + if (priv->transmit_result != 0 || priv->command_enqueued) { ret = -EBUSY; goto out; } @@ -168,7 +168,7 @@ ssize_t tpm_common_write(struct file *file, const char __user *buf, tpm_put_ops(priv->chip); if (ret > 0) { - priv->data_pending = ret; + priv->transmit_result = ret; mod_timer(&priv->user_read_timer, jiffies + (120 * HZ)); ret = size; } @@ -184,7 +184,7 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait) poll_wait(file, &priv->async_wait, wait); - if (priv->data_pending) + if (priv->transmit_result) mask = EPOLLIN | EPOLLRDNORM; else mask = EPOLLOUT | EPOLLWRNORM; @@ -201,7 +201,7 @@ void tpm_common_release(struct file *file, struct file_priv *priv) del_singleshot_timer_sync(&priv->user_read_timer); flush_work(&priv->timeout_work); file->private_data = NULL; - priv->data_pending = 0; + priv->transmit_result = 0; } int __init tpm_dev_common_init(void) diff --git a/drivers/char/tpm/tpm-dev.h b/drivers/char/tpm/tpm-dev.h index a126b575cb8c..3ff1dc9f3d75 100644 --- a/drivers/char/tpm/tpm-dev.h +++ b/drivers/char/tpm/tpm-dev.h @@ -9,8 +9,8 @@ struct file_priv { struct tpm_chip *chip; struct tpm_space *space; - /* Holds the amount of data passed or an error code from async op */ - ssize_t data_pending; + /* Holds the resul of the last successful call to tpm_transmit() */ + size_t transmit_result; struct mutex buffer_mutex; struct timer_list user_read_timer; /* user needs to claim result */ From patchwork Fri Nov 16 17:51:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tadeusz Struk X-Patchwork-Id: 10686731 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B40BA14D6 for ; Fri, 16 Nov 2018 17:51:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A42772D75B for ; Fri, 16 Nov 2018 17:51:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9871D2D762; Fri, 16 Nov 2018 17:51:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 208042D75B for ; Fri, 16 Nov 2018 17:51:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729213AbeKQEFN (ORCPT ); Fri, 16 Nov 2018 23:05:13 -0500 Received: from mga04.intel.com ([192.55.52.120]:20990 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729198AbeKQEFN (ORCPT ); Fri, 16 Nov 2018 23:05:13 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Nov 2018 09:51:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,240,1539673200"; d="scan'208";a="274595966" Received: from tstruk-mobl1.jf.intel.com ([10.7.196.53]) by orsmga005.jf.intel.com with ESMTP; 16 Nov 2018 09:51:51 -0800 Subject: [PATCH v4 2/2] tpm: add support for partial reads From: Tadeusz Struk To: jarkko.sakkinen@linux.intel.com Cc: jgg@ziepe.ca, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, tadeusz.struk@intel.com Date: Fri, 16 Nov 2018 09:51:51 -0800 Message-ID: <154239071144.2924.17574189056250189697.stgit@tstruk-mobl1.jf.intel.com> In-Reply-To: <154239067364.2880.13752725056462237016.stgit@tstruk-mobl1.jf.intel.com> References: <154239067364.2880.13752725056462237016.stgit@tstruk-mobl1.jf.intel.com> User-Agent: StGit/unknown-version MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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) { + 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; struct mutex buffer_mutex; struct timer_list user_read_timer; /* user needs to claim result */