From: Tomas Winkler <tomas.winkler@intel.com> To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jason Gunthorpe <jgg@ziepe.ca> Cc: 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 v3 16/20] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure Date: Tue, 18 Sep 2018 12:34:55 +0300 [thread overview] Message-ID: <20180918093459.19165-17-tomas.winkler@intel.com> (raw) In-Reply-To: <20180918093459.19165-1-tomas.winkler@intel.com> 1. Use tpm_buf in tpm1_get_random() 2. Fix comment in tpm_get_random() so it is clear that the function is expected to return number of random bytes. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- V3: new in the series drivers/char/tpm/tpm-interface.c | 2 +- drivers/char/tpm/tpm.h | 11 ------ drivers/char/tpm/tpm1-cmd.c | 85 +++++++++++++++++++++++----------------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 358ef5bd601e..e3206874be22 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -576,7 +576,7 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume); * @out: destination buffer for the random bytes * @max: the max number of bytes to write to @out * - * Return: same as with tpm_transmit_cmd() + * Return: number of random bytes read or a negative error value. */ int tpm_get_random(struct tpm_chip *chip, u8 *out, size_t max) { diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 4ccffbb56864..d6eca81a011a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -396,20 +396,9 @@ struct tpm_pcrread_in { * compiler warnings about stack frame size. */ #define TPM_MAX_RNG_DATA 128 -struct tpm_getrandom_out { - __be32 rng_data_len; - u8 rng_data[TPM_MAX_RNG_DATA]; -} __packed; - -struct tpm_getrandom_in { - __be32 num_bytes; -} __packed; - typedef union { struct tpm_pcrread_in pcrread_in; struct tpm_pcrread_out pcrread_out; - struct tpm_getrandom_in getrandom_in; - struct tpm_getrandom_out getrandom_out; } tpm_cmd_params; struct tpm_cmd_t { diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 90e5bc1720ad..5708d4bf908f 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -507,58 +507,71 @@ ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap, EXPORT_SYMBOL_GPL(tpm1_getcap); #define TPM_ORD_GET_RANDOM 70 -#define TPM_GETRANDOM_RESULT_SIZE 18 -static const struct tpm_input_header tpm_getrandom_header = { - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), - .length = cpu_to_be32(14), - .ordinal = cpu_to_be32(TPM_ORD_GET_RANDOM) -}; +struct tpm1_get_random_out { + __be32 rng_data_len; + u8 rng_data[TPM_MAX_RNG_DATA]; +} __packed; -int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max) +/** + * tpm1_get_random() - get random bytes from the TPM's RNG + * + * @chip: a &struct tpm_chip instance + * @dest: destination buffer for the random bytes + * @max: the maximum number of bytes to write to @dest + * + * Return: + * number of bytes read + * -errno or a TPM return code otherwise + */ +int tpm1_get_random(struct tpm_chip *chip, u8 *dest, size_t max) { - struct tpm_cmd_t tpm_cmd; + struct tpm1_get_random_out *out; + u32 num_bytes = min_t(u32, max, TPM_MAX_RNG_DATA); + struct tpm_buf buf; + u32 total = 0; + int retries = 5; u32 recd; - u32 num_bytes = min_t(u32, max, TPM_MAX_RNG_DATA); - u32 rlength; - int err, total = 0, retries = 5; - u8 *dest = out; + int rc; - if (!out || !num_bytes || max > TPM_MAX_RNG_DATA) - return -EINVAL; + rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_GET_RANDOM); + if (rc) + return rc; do { - tpm_cmd.header.in = tpm_getrandom_header; - tpm_cmd.params.getrandom_in.num_bytes = cpu_to_be32(num_bytes); - - err = tpm_transmit_cmd(chip, NULL, &tpm_cmd, - TPM_GETRANDOM_RESULT_SIZE + num_bytes, - offsetof(struct tpm_getrandom_out, - rng_data), - 0, "attempting get random"); - if (err) - break; + tpm_buf_append_u32(&buf, num_bytes); + + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, + sizeof(out->rng_data_len), 0, + "attempting get random"); + if (rc) + goto out; - recd = be32_to_cpu(tpm_cmd.params.getrandom_out.rng_data_len); + out = (struct tpm1_get_random_out *)&buf.data[TPM_HEADER_SIZE]; + + recd = be32_to_cpu(out->rng_data_len); if (recd > num_bytes) { - total = -EFAULT; - break; + rc = -EFAULT; + goto out; } - rlength = be32_to_cpu(tpm_cmd.header.out.length); - if (rlength < TPM_HEADER_SIZE + - offsetof(struct tpm_getrandom_out, rng_data) + - recd) { - total = -EFAULT; - break; + if (tpm_buf_length(&buf) < TPM_HEADER_SIZE + + sizeof(out->rng_data_len) + recd) { + rc = -EFAULT; + goto out; } - memcpy(dest, tpm_cmd.params.getrandom_out.rng_data, recd); + memcpy(dest, out->rng_data, recd); dest += recd; total += recd; num_bytes -= recd; - } while (retries-- && (size_t)total < max); - return total ? total : -EIO; + tpm_buf_reset(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_GET_RANDOM); + } while (retries-- && total < max); + + rc = total ? total : -EIO; +out: + tpm_buf_destroy(&buf); + return rc; } #define TPM_ORDINAL_PCRREAD 21 -- 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 v3 16/20] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure Date: Tue, 18 Sep 2018 12:34:55 +0300 [thread overview] Message-ID: <20180918093459.19165-17-tomas.winkler@intel.com> (raw) In-Reply-To: <20180918093459.19165-1-tomas.winkler@intel.com> 1. Use tpm_buf in tpm1_get_random() 2. Fix comment in tpm_get_random() so it is clear that the function is expected to return number of random bytes. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> --- V3: new in the series drivers/char/tpm/tpm-interface.c | 2 +- drivers/char/tpm/tpm.h | 11 ------ drivers/char/tpm/tpm1-cmd.c | 85 +++++++++++++++++++++++----------------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 358ef5bd601e..e3206874be22 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -576,7 +576,7 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume); * @out: destination buffer for the random bytes * @max: the max number of bytes to write to @out * - * Return: same as with tpm_transmit_cmd() + * Return: number of random bytes read or a negative error value. */ int tpm_get_random(struct tpm_chip *chip, u8 *out, size_t max) { diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 4ccffbb56864..d6eca81a011a 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -396,20 +396,9 @@ struct tpm_pcrread_in { * compiler warnings about stack frame size. */ #define TPM_MAX_RNG_DATA 128 -struct tpm_getrandom_out { - __be32 rng_data_len; - u8 rng_data[TPM_MAX_RNG_DATA]; -} __packed; - -struct tpm_getrandom_in { - __be32 num_bytes; -} __packed; - typedef union { struct tpm_pcrread_in pcrread_in; struct tpm_pcrread_out pcrread_out; - struct tpm_getrandom_in getrandom_in; - struct tpm_getrandom_out getrandom_out; } tpm_cmd_params; struct tpm_cmd_t { diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 90e5bc1720ad..5708d4bf908f 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -507,58 +507,71 @@ ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap, EXPORT_SYMBOL_GPL(tpm1_getcap); #define TPM_ORD_GET_RANDOM 70 -#define TPM_GETRANDOM_RESULT_SIZE 18 -static const struct tpm_input_header tpm_getrandom_header = { - .tag = cpu_to_be16(TPM_TAG_RQU_COMMAND), - .length = cpu_to_be32(14), - .ordinal = cpu_to_be32(TPM_ORD_GET_RANDOM) -}; +struct tpm1_get_random_out { + __be32 rng_data_len; + u8 rng_data[TPM_MAX_RNG_DATA]; +} __packed; -int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max) +/** + * tpm1_get_random() - get random bytes from the TPM's RNG + * + * @chip: a &struct tpm_chip instance + * @dest: destination buffer for the random bytes + * @max: the maximum number of bytes to write to @dest + * + * Return: + * number of bytes read + * -errno or a TPM return code otherwise + */ +int tpm1_get_random(struct tpm_chip *chip, u8 *dest, size_t max) { - struct tpm_cmd_t tpm_cmd; + struct tpm1_get_random_out *out; + u32 num_bytes = min_t(u32, max, TPM_MAX_RNG_DATA); + struct tpm_buf buf; + u32 total = 0; + int retries = 5; u32 recd; - u32 num_bytes = min_t(u32, max, TPM_MAX_RNG_DATA); - u32 rlength; - int err, total = 0, retries = 5; - u8 *dest = out; + int rc; - if (!out || !num_bytes || max > TPM_MAX_RNG_DATA) - return -EINVAL; + rc = tpm_buf_init(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_GET_RANDOM); + if (rc) + return rc; do { - tpm_cmd.header.in = tpm_getrandom_header; - tpm_cmd.params.getrandom_in.num_bytes = cpu_to_be32(num_bytes); - - err = tpm_transmit_cmd(chip, NULL, &tpm_cmd, - TPM_GETRANDOM_RESULT_SIZE + num_bytes, - offsetof(struct tpm_getrandom_out, - rng_data), - 0, "attempting get random"); - if (err) - break; + tpm_buf_append_u32(&buf, num_bytes); + + rc = tpm_transmit_cmd(chip, NULL, buf.data, PAGE_SIZE, + sizeof(out->rng_data_len), 0, + "attempting get random"); + if (rc) + goto out; - recd = be32_to_cpu(tpm_cmd.params.getrandom_out.rng_data_len); + out = (struct tpm1_get_random_out *)&buf.data[TPM_HEADER_SIZE]; + + recd = be32_to_cpu(out->rng_data_len); if (recd > num_bytes) { - total = -EFAULT; - break; + rc = -EFAULT; + goto out; } - rlength = be32_to_cpu(tpm_cmd.header.out.length); - if (rlength < TPM_HEADER_SIZE + - offsetof(struct tpm_getrandom_out, rng_data) + - recd) { - total = -EFAULT; - break; + if (tpm_buf_length(&buf) < TPM_HEADER_SIZE + + sizeof(out->rng_data_len) + recd) { + rc = -EFAULT; + goto out; } - memcpy(dest, tpm_cmd.params.getrandom_out.rng_data, recd); + memcpy(dest, out->rng_data, recd); dest += recd; total += recd; num_bytes -= recd; - } while (retries-- && (size_t)total < max); - return total ? total : -EIO; + tpm_buf_reset(&buf, TPM_TAG_RQU_COMMAND, TPM_ORD_GET_RANDOM); + } while (retries-- && total < max); + + rc = total ? total : -EIO; +out: + tpm_buf_destroy(&buf); + return rc; } #define TPM_ORDINAL_PCRREAD 21 -- 2.14.4
next prev parent reply other threads:[~2018-09-18 9:38 UTC|newest] Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-18 9:34 [PATCH v3 00/20] tpm: separate tpm 1.x and tpm 2.x commands Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-18 9:34 ` [PATCH v3 01/20] tpm2: add new tpm2 commands according to TCG 1.36 Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler [not found] ` <20180919134627.GA26571@linux.intel.com> 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 02/20] tpm: sort objects in the Makefile Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 13:48 ` Jarkko Sakkinen 2018-09-19 13:48 ` Jarkko Sakkinen 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-19 13:59 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 03/20] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 13:55 ` Jarkko Sakkinen 2018-09-19 13:55 ` Jarkko Sakkinen 2018-09-19 14:00 ` Jarkko Sakkinen 2018-09-19 14:00 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 04/20] tpm: add tpm_calc_ordinal_duration wrapper Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:02 ` Jarkko Sakkinen 2018-09-19 14:02 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 05/20] tpm: factor out tpm_get_timeouts Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:04 ` Jarkko Sakkinen 2018-09-19 14:04 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 06/20] tpm: move tpm1_pcr_extend to tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:06 ` Jarkko Sakkinen 2018-09-19 14:06 ` Jarkko Sakkinen 2018-09-19 14:06 ` Jarkko Sakkinen 2018-09-25 16:25 ` Nayna Jain 2018-09-25 16:25 ` Nayna Jain 2018-09-25 16:25 ` Nayna Jain 2018-09-18 9:34 ` [PATCH v3 07/20] tpm: move tpm_getcap " Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:09 ` Jarkko Sakkinen 2018-09-19 14:09 ` Jarkko Sakkinen 2018-09-19 14:09 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 08/20] tpm: factor out tpm1_get_random into tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:56 ` Jarkko Sakkinen 2018-09-19 14:56 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 09/20] tpm: move tpm1 selftest code from tpm-interface tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:05 ` Jarkko Sakkinen 2018-09-19 15:05 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 10/20] tpm: factor out tpm1 pm suspend flow into tpm1-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:03 ` Jarkko Sakkinen 2018-09-19 15:03 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 11/20] tpm: factor out tpm_startup function Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:07 ` Jarkko Sakkinen 2018-09-19 15:07 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 12/20] tpm: move pcr extend code to tpm2-cmd.c Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 14:58 ` Jarkko Sakkinen 2018-09-19 14:58 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 13/20] tpm: add tpm_auto_startup into tpm-interface Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:09 ` Jarkko Sakkinen 2018-09-19 15:09 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 14/20] tpm: tpm-interface.c drop unused macros Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:10 ` Jarkko Sakkinen 2018-09-19 15:10 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 15/20] tpm: tpm-space.c remove unneeded semicolon Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-18 9:34 ` Tomas Winkler [this message] 2018-09-18 9:34 ` [PATCH v3 16/20] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure Tomas Winkler 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-19 15:12 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 17/20] tpm1: implement tpm1_pcr_read_dev() " Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:13 ` Jarkko Sakkinen 2018-09-19 15:13 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 18/20] tpm: use u32 instead of int for pcr index Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:22 ` Jarkko Sakkinen 2018-09-19 15:22 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 19/20] tpm1: reimplement SAVESTATE using tpm_buf Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:23 ` Jarkko Sakkinen 2018-09-19 15:23 ` Jarkko Sakkinen 2018-09-18 9:34 ` [PATCH v3 20/20] tpm1: reimplement tpm1_continue_selftest() " Tomas Winkler 2018-09-18 9:34 ` Tomas Winkler 2018-09-19 15:24 ` Jarkko Sakkinen 2018-09-19 15:24 ` 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=20180918093459.19165-17-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=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.