From: Tomas Winkler <tomas.winkler@intel.com> To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jason Gunthorpe <jgg@ziepe.ca> Cc: Nayna Jain <nayna@linux.vnet.ibm.com>, Alexander Usyskin <alexander.usyskin@intel.com>, Tadeusz Struk <tadeusz.struk@intel.com>, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler <tomas.winkler@intel.com> Subject: [PATCH v5 19/21] tpm1: reimplement SAVESTATE using tpm_buf Date: Sat, 29 Sep 2018 01:30:33 +0300 [thread overview] Message-ID: <20180928223035.14471-20-tomas.winkler@intel.com> (raw) In-Reply-To: <20180928223035.14471-1-tomas.winkler@intel.com> In tpm1_pm_suspend() function reimplement, TPM_ORD_SAVESTATE comamnd using tpm_buf. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- V3: New in the series. V4-V5: Resend drivers/char/tpm/tpm1-cmd.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 05b772477bac..d418a27a75e0 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -718,12 +718,6 @@ int tpm1_auto_startup(struct tpm_chip *chip) } #define TPM_ORD_SAVESTATE 152 -#define SAVESTATE_RESULT_SIZE 10 -static const struct tpm_input_header savestate_header = { - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), - .length = cpu_to_be32(10), - .ordinal = cpu_to_be32(TPM_ORD_SAVESTATE) -}; /** * tpm1_pm_suspend() - pm suspend handler @@ -739,18 +733,22 @@ static const struct tpm_input_header savestate_header = { int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) { u8 dummy_hash[TPM_DIGEST_SIZE] = { 0 }; - struct tpm_cmd_t cmd; - int rc, try; + struct tpm_buf buf; + unsigned int try; + int rc; + /* for buggy tpm, flush pcrs with extend to selected dummy */ if (tpm_suspend_pcr) rc = tpm1_pcr_extend(chip, tpm_suspend_pcr, dummy_hash, "extending dummy pcr before suspend"); + rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_SAVESTATE); + if (rc) + return rc; /* now do the actual savestate */ for (try = 0; try < TPM_RETRY; try++) { - cmd.header.in = savestate_header; - rc = tpm_transmit_cmd(chip, NULL, &cmd, SAVESTATE_RESULT_SIZE, + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, NULL); /* @@ -766,6 +764,8 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) if (rc != TPM_WARN_RETRY) break; tpm_msleep(TPM_TIMEOUT_RETRY); + + tpm_buf_reset(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_SAVESTATE); } if (rc) @@ -775,6 +775,8 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) dev_warn(&chip->dev, "TPM savestate took %dms\n", try * TPM_TIMEOUT_RETRY); + tpm_buf_destroy(&buf); + return rc; } -- 2.14.4
WARNING: multiple messages have this Message-ID (diff)
From: tomas.winkler@intel.com (Tomas Winkler) To: linux-security-module@vger.kernel.org Subject: [PATCH v5 19/21] tpm1: reimplement SAVESTATE using tpm_buf Date: Sat, 29 Sep 2018 01:30:33 +0300 [thread overview] Message-ID: <20180928223035.14471-20-tomas.winkler@intel.com> (raw) In-Reply-To: <20180928223035.14471-1-tomas.winkler@intel.com> In tpm1_pm_suspend() function reimplement, TPM_ORD_SAVESTATE comamnd using tpm_buf. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> --- V3: New in the series. V4-V5: Resend drivers/char/tpm/tpm1-cmd.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 05b772477bac..d418a27a75e0 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -718,12 +718,6 @@ int tpm1_auto_startup(struct tpm_chip *chip) } #define TPM_ORD_SAVESTATE 152 -#define SAVESTATE_RESULT_SIZE 10 -static const struct tpm_input_header savestate_header = { - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), - .length = cpu_to_be32(10), - .ordinal = cpu_to_be32(TPM_ORD_SAVESTATE) -}; /** * tpm1_pm_suspend() - pm suspend handler @@ -739,18 +733,22 @@ static const struct tpm_input_header savestate_header = { int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) { u8 dummy_hash[TPM_DIGEST_SIZE] = { 0 }; - struct tpm_cmd_t cmd; - int rc, try; + struct tpm_buf buf; + unsigned int try; + int rc; + /* for buggy tpm, flush pcrs with extend to selected dummy */ if (tpm_suspend_pcr) rc = tpm1_pcr_extend(chip, tpm_suspend_pcr, dummy_hash, "extending dummy pcr before suspend"); + rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_SAVESTATE); + if (rc) + return rc; /* now do the actual savestate */ for (try = 0; try < TPM_RETRY; try++) { - cmd.header.in = savestate_header; - rc = tpm_transmit_cmd(chip, NULL, &cmd, SAVESTATE_RESULT_SIZE, + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, 0, 0, NULL); /* @@ -766,6 +764,8 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) if (rc != TPM_WARN_RETRY) break; tpm_msleep(TPM_TIMEOUT_RETRY); + + tpm_buf_reset(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_SAVESTATE); } if (rc) @@ -775,6 +775,8 @@ int tpm1_pm_suspend(struct tpm_chip *chip, int tpm_suspend_pcr) dev_warn(&chip->dev, "TPM savestate took %dms\n", try * TPM_TIMEOUT_RETRY); + tpm_buf_destroy(&buf); + return rc; } -- 2.14.4
next prev parent reply other threads:[~2018-09-28 22:35 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-28 22:30 [PATCH v5 00/21] tpm: separate tpm 1.x and tpm 2.x commands Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 01/21] tpm2: add new tpm2 commands according to TCG 1.36 Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:38 ` Jarkko Sakkinen 2018-10-02 0:40 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 02/21] tpm: sort objects in the Makefile Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-11 16:55 ` Nayna Jain 2018-10-11 16:55 ` Nayna Jain 2018-09-28 22:30 ` [PATCH v5 04/21] tpm: add tpm_calc_ordinal_duration() wrapper Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 05/21] tpm: factor out tpm_get_timeouts() Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-11 17:00 ` Nayna Jain 2018-10-11 17:00 ` Nayna Jain 2018-10-11 20:16 ` Winkler, Tomas 2018-10-11 20:16 ` Winkler, Tomas 2018-09-28 22:30 ` [PATCH v5 06/21] tpm: move tpm1_pcr_extend to tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:42 ` Jarkko Sakkinen 2018-10-02 0:42 ` Jarkko Sakkinen 2018-10-02 9:28 ` Nayna Jain 2018-10-02 9:28 ` Nayna Jain 2018-10-03 12:02 ` Jarkko Sakkinen 2018-10-03 12:02 ` Jarkko Sakkinen 2018-10-12 9:31 ` Nayna Jain 2018-10-12 9:31 ` Nayna Jain 2018-10-16 16:48 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 07/21] tpm: move tpm_getcap " Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 08/21] tpm: factor out tpm1_get_random into tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:43 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 09/21] tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 10/21] tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:45 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 11/21] tpm: factor out tpm_startup function Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:46 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 12/21] tpm: move pcr extend code to tpm2-cmd.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:52 ` Jarkko Sakkinen 2018-10-02 4:58 ` Winkler, Tomas 2018-10-02 4:58 ` Winkler, Tomas 2018-10-03 12:01 ` Jarkko Sakkinen 2018-10-03 12:01 ` Jarkko Sakkinen 2018-10-03 22:24 ` Winkler, Tomas 2018-10-03 22:24 ` Winkler, Tomas 2018-10-04 11:35 ` Jarkko Sakkinen 2018-10-04 11:35 ` Jarkko Sakkinen 2018-10-04 11:36 ` Jarkko Sakkinen 2018-10-04 11:36 ` Jarkko Sakkinen 2018-10-04 11:45 ` Winkler, Tomas 2018-10-04 11:45 ` Winkler, Tomas 2018-10-04 12:20 ` Roberto Sassu 2018-10-04 12:20 ` Roberto Sassu 2018-10-04 13:46 ` Winkler, Tomas 2018-10-04 13:46 ` Winkler, Tomas 2018-10-04 14:10 ` Roberto Sassu 2018-10-04 14:10 ` Roberto Sassu 2018-10-05 11:31 ` Jarkko Sakkinen 2018-10-05 11:31 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 13/21] tpm: add tpm_auto_startup() into tpm-interface.c Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:56 ` Jarkko Sakkinen 2018-09-28 22:30 ` [PATCH v5 14/21] tpm: tpm-interface.c drop unused macros Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 15/21] tpm: tpm-space.c remove unneeded semicolon Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 16/21] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 17/21] tpm1: implement tpm1_pcr_read_dev() " Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 18/21] tmp1: rename tpm1_pcr_read_dev to tpm1_pcr_read() Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler [this message] 2018-09-28 22:30 ` [PATCH v5 19/21] tpm1: reimplement SAVESTATE using tpm_buf Tomas Winkler 2018-09-28 22:30 ` [PATCH v5 20/21] tpm1: reimplement tpm1_continue_selftest() " Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-17 6:02 ` Nayna Jain 2018-10-17 6:02 ` Nayna Jain 2018-09-28 22:30 ` [PATCH v5 21/21] tpm: use u32 instead of int for PCR index Tomas Winkler 2018-09-28 22:30 ` Tomas Winkler 2018-10-02 0:58 ` Jarkko Sakkinen 2018-10-02 0:44 ` [PATCH v5 00/21] tpm: separate tpm 1.x and tpm 2.x commands 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=20180928223035.14471-20-tomas.winkler@intel.com \ --to=tomas.winkler@intel.com \ --cc=alexander.usyskin@intel.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=jgg@ziepe.ca \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=nayna@linux.vnet.ibm.com \ --cc=tadeusz.struk@intel.com \ /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: linkBe 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.