[v5,12/21] tpm: move pcr extend code to tpm2-cmd.c

Message ID	20180928223035.14471-13-tomas.winkler@intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-security-module-owner@kernel.org> 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 12/21] tpm: move pcr extend code to tpm2-cmd.c Date: Sat, 29 Sep 2018 01:30:26 +0300 Message-Id: <20180928223035.14471-13-tomas.winkler@intel.com> In-Reply-To: <20180928223035.14471-1-tomas.winkler@intel.com> References: <20180928223035.14471-1-tomas.winkler@intel.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk
Series	tpm: separate tpm 1.x and tpm 2.x commands \| expand [v5,00/21] tpm: separate tpm 1.x and tpm 2.x commands [v5,01/21] tpm2: add new tpm2 commands according to TCG 1.36 [v5,02/21] tpm: sort objects in the Makefile [v5,03/21] tpm: factor out tpm 1.x duration calculation to tpm1-cmd.c [v5,04/21] tpm: add tpm_calc_ordinal_duration() wrapper [v5,05/21] tpm: factor out tpm_get_timeouts() [v5,06/21] tpm: move tpm1_pcr_extend to tpm1-cmd.c [v5,07/21] tpm: move tpm_getcap to tpm1-cmd.c [v5,08/21] tpm: factor out tpm1_get_random into tpm1-cmd.c [v5,09/21] tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c [v5,10/21] tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.c [v5,11/21] tpm: factor out tpm_startup function [v5,12/21] tpm: move pcr extend code to tpm2-cmd.c [v5,13/21] tpm: add tpm_auto_startup() into tpm-interface.c [v5,14/21] tpm: tpm-interface.c drop unused macros [v5,15/21] tpm: tpm-space.c remove unneeded semicolon [v5,16/21] tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure [v5,17/21] tpm1: implement tpm1_pcr_read_dev() using tpm_buf structure [v5,18/21] tmp1: rename tpm1_pcr_read_dev to tpm1_pcr_read(). [v5,19/21] tpm1: reimplement SAVESTATE using tpm_buf [v5,20/21] tpm1: reimplement tpm1_continue_selftest() using tpm_buf [v5,21/21] tpm: use u32 instead of int for PCR index

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index d33060511a27..1ea83a3f1b02 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c @@ -491,31 +491,17 @@ EXPORT_SYMBOL_GPL(tpm_pcr_read); int tpm_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash) { int rc; - struct tpm2_digest digest_list[ARRAY_SIZE(chip->active_banks)]; - u32 count = 0; - int i; chip = tpm_find_get_ops(chip); if (!chip) return -ENODEV; - if (chip->flags & TPM_CHIP_FLAG_TPM2) { - memset(digest_list, 0, sizeof(digest_list)); - - for (i = 0; i < ARRAY_SIZE(chip->active_banks) && - chip->active_banks[i] != TPM2_ALG_ERROR; i++) { - digest_list[i].alg_id = chip->active_banks[i]; - memcpy(digest_list[i].digest, hash, TPM_DIGEST_SIZE); - count++; - } - - rc = tpm2_pcr_extend(chip, pcr_idx, count, digest_list); - tpm_put_ops(chip); - return rc; - } + if (chip->flags & TPM_CHIP_FLAG_TPM2) + rc = tpm2_pcr_extend(chip, pcr_idx, hash); + else + rc = tpm1_pcr_extend(chip, pcr_idx, hash, + "attempting extend a PCR value"); - rc = tpm1_pcr_extend(chip, pcr_idx, hash, - "attempting extend a PCR value"); tpm_put_ops(chip); return rc; } diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index fa88102a0cab..f0963a0a8acd 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -592,8 +592,7 @@ static inline u32 tpm2_rc_value(u32 rc) int tpm2_get_timeouts(struct tpm_chip *chip); int tpm2_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf); -int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, u32 count, - struct tpm2_digest *digests); +int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash); int tpm2_get_random(struct tpm_chip *chip, u8 *dest, size_t max); void tpm2_flush_context_cmd(struct tpm_chip *chip, u32 handle, unsigned int flags); diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c index 5b2e743a3e51..8a84db315676 100644 --- a/drivers/char/tpm/tpm1-cmd.c +++ b/drivers/char/tpm/tpm1-cmd.c @@ -312,7 +312,7 @@ unsigned long tpm1_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal) #define TPM_ST_CLEAR 1 /** - * tpm_startup - turn on the TPM + * tpm_startup() - turn on the TPM * @chip: TPM chip to use * * Normally the firmware should start the TPM. This function is provided as a diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c index a3d39360620f..2b705b00db78 100644 --- a/drivers/char/tpm/tpm2-cmd.c +++ b/drivers/char/tpm/tpm2-cmd.c @@ -216,23 +216,21 @@ struct tpm2_null_auth_area { } __packed; /** - * tpm2_pcr_extend() - extend a PCR value - * - * @chip: TPM chip to use. - * @pcr_idx: index of the PCR. - * @count: number of digests passed. - * @digests: list of pcr banks and corresponding digest values to extend. + * __tpm2_pcr_extend() - extend a PCR value + * @chip: TPM chip to use. + * @pcr_idx: index of the PCR. + * @count: number of digests passed. + * @digests: list of pcr banks and corresponding digest values to extend. * * Return: Same as with tpm_transmit_cmd. */ -int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, u32 count, - struct tpm2_digest *digests) +static int __tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, u32 count, + struct tpm2_digest *digests) { struct tpm_buf buf; struct tpm2_null_auth_area auth_area; + u32 i, j; int rc; - int i; - int j; if (count > ARRAY_SIZE(chip->active_banks)) return -EINVAL; @@ -272,6 +270,34 @@ int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, u32 count, return rc; } +/** + * tpm2_pcr_extend() - extend a PCR value + * @chip: TPM chip to use. + * @pcr_idx: index of the PCR to extend. + * @hash: the hash of a measurement. + * + * Return: Same as with tpm_transmit_cmd. + */ +int tpm2_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash) +{ + int rc; + struct tpm2_digest digest_list[ARRAY_SIZE(chip->active_banks)]; + u32 count = 0; + unsigned int i; + + memset(digest_list, 0, sizeof(digest_list)); + for (i = 0; i < ARRAY_SIZE(chip->active_banks); i++) { + if (chip->active_banks[i] == TPM2_ALG_ERROR) + break; + digest_list[i].alg_id = chip->active_banks[i]; + memcpy(digest_list[i].digest, hash, TPM_DIGEST_SIZE); + count++; + } + + rc = __tpm2_pcr_extend(chip, pcr_idx, count, digest_list); + return rc; +} + struct tpm2_get_random_out { __be16 size;

[v5,12/21] tpm: move pcr extend code to tpm2-cmd.c

Commit Message

Comments

Patch