Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6831a89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-20190805' of git://git.infradead.org/users/jjs/linux-tpmdd 

Pull tpm fixes from Jarkko Sakkinen:
 "Two bug fixes that did not make into my first pull request"

* tag 'tpmdd-next-20190805' of git://git.infradead.org/users/jjs/linux-tpmdd:
  tpm: tpm_ibm_vtpm: Fix unallocated banks
  tpm: Fix null pointer dereference on chip register error path
parents 62d17163 fa4f99c0

drivers/char/tpm/tpm-chip.c

+36 −7
Original line number Diff line number Diff line
@@ -77,6 +77,18 @@ static int tpm_go_idle(struct tpm_chip *chip) 
	return chip->ops->go_idle(chip);

}



static void tpm_clk_enable(struct tpm_chip *chip)

{

	if (chip->ops->clk_enable)

		chip->ops->clk_enable(chip, true);

}



static void tpm_clk_disable(struct tpm_chip *chip)

{

	if (chip->ops->clk_enable)

		chip->ops->clk_enable(chip, false);

}



/**

 * tpm_chip_start() - power on the TPM

 * @chip:	a TPM chip to use
@@ -89,13 +101,12 @@ int tpm_chip_start(struct tpm_chip *chip) 
{

	int ret;



	if (chip->ops->clk_enable)

		chip->ops->clk_enable(chip, true);

	tpm_clk_enable(chip);



	if (chip->locality == -1) {

		ret = tpm_request_locality(chip);

		if (ret) {

			chip->ops->clk_enable(chip, false);

			tpm_clk_disable(chip);

			return ret;

		}

	}
@@ -103,8 +114,7 @@ int tpm_chip_start(struct tpm_chip *chip) 
	ret = tpm_cmd_ready(chip);

	if (ret) {

		tpm_relinquish_locality(chip);

		if (chip->ops->clk_enable)

			chip->ops->clk_enable(chip, false);

		tpm_clk_disable(chip);

		return ret;

	}
@@ -124,8 +134,7 @@ void tpm_chip_stop(struct tpm_chip *chip) 
{

	tpm_go_idle(chip);

	tpm_relinquish_locality(chip);

	if (chip->ops->clk_enable)

		chip->ops->clk_enable(chip, false);

	tpm_clk_disable(chip);

}

EXPORT_SYMBOL_GPL(tpm_chip_stop);
@@ -545,6 +554,20 @@ static int tpm_add_hwrng(struct tpm_chip *chip) 
	return hwrng_register(&chip->hwrng);

}



static int tpm_get_pcr_allocation(struct tpm_chip *chip)

{

	int rc;



	rc = (chip->flags & TPM_CHIP_FLAG_TPM2) ?

	     tpm2_get_pcr_allocation(chip) :

	     tpm1_get_pcr_allocation(chip);



	if (rc > 0)

		return -ENODEV;



	return rc;

}



/*

 * tpm_chip_register() - create a character device for the TPM chip

 * @chip: TPM chip to use.
@@ -564,6 +587,12 @@ int tpm_chip_register(struct tpm_chip *chip) 
	if (rc)

		return rc;

	rc = tpm_auto_startup(chip);

	if (rc) {

		tpm_chip_stop(chip);

		return rc;

	}



	rc = tpm_get_pcr_allocation(chip);

	tpm_chip_stop(chip);

	if (rc)

		return rc;

drivers/char/tpm/tpm.h

+2 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ int tpm1_pcr_read(struct tpm_chip *chip, u32 pcr_idx, u8 *res_buf); 
ssize_t tpm1_getcap(struct tpm_chip *chip, u32 subcap_id, cap_t *cap,

		    const char *desc, size_t min_cap_length);

int tpm1_get_random(struct tpm_chip *chip, u8 *out, size_t max);

int tpm1_get_pcr_allocation(struct tpm_chip *chip);

unsigned long tpm_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

int tpm_pm_suspend(struct device *dev);

int tpm_pm_resume(struct device *dev);
@@ -449,6 +450,7 @@ int tpm2_unseal_trusted(struct tpm_chip *chip, 
ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id,

			u32 *value, const char *desc);



ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip);

int tpm2_auto_startup(struct tpm_chip *chip);

void tpm2_shutdown(struct tpm_chip *chip, u16 shutdown_type);

unsigned long tpm2_calc_ordinal_duration(struct tpm_chip *chip, u32 ordinal);

drivers/char/tpm/tpm1-cmd.c

+24 −12
Original line number Diff line number Diff line
@@ -699,18 +699,6 @@ int tpm1_auto_startup(struct tpm_chip *chip) 
		goto out;

	}



	chip->allocated_banks = kcalloc(1, sizeof(*chip->allocated_banks),

					GFP_KERNEL);

	if (!chip->allocated_banks) {

		rc = -ENOMEM;

		goto out;

	}



	chip->allocated_banks[0].alg_id = TPM_ALG_SHA1;

	chip->allocated_banks[0].digest_size = hash_digest_size[HASH_ALGO_SHA1];

	chip->allocated_banks[0].crypto_id = HASH_ALGO_SHA1;

	chip->nr_allocated_banks = 1;



	return rc;

out:

	if (rc > 0)
@@ -779,3 +767,27 @@ int tpm1_pm_suspend(struct tpm_chip *chip, u32 tpm_suspend_pcr) 
	return rc;

}



/**

 * tpm1_get_pcr_allocation() - initialize the allocated bank

 * @chip: TPM chip to use.

 *

 * The function initializes the SHA1 allocated bank to extend PCR

 *

 * Return:

 * * 0 on success,

 * * < 0 on error.

 */

int tpm1_get_pcr_allocation(struct tpm_chip *chip)

{

	chip->allocated_banks = kcalloc(1, sizeof(*chip->allocated_banks),

					GFP_KERNEL);

	if (!chip->allocated_banks)

		return -ENOMEM;



	chip->allocated_banks[0].alg_id = TPM_ALG_SHA1;

	chip->allocated_banks[0].digest_size = hash_digest_size[HASH_ALGO_SHA1];

	chip->allocated_banks[0].crypto_id = HASH_ALGO_SHA1;

	chip->nr_allocated_banks = 1;



	return 0;

}

drivers/char/tpm/tpm2-cmd.c

+1 −5
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ struct tpm2_pcr_selection { 
	u8  pcr_select[3];

} __packed;



static ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip)

ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip)

{

	struct tpm2_pcr_selection pcr_selection;

	struct tpm_buf buf;
@@ -1040,10 +1040,6 @@ int tpm2_auto_startup(struct tpm_chip *chip) 
			goto out;

	}



	rc = tpm2_get_pcr_allocation(chip);

	if (rc)

		goto out;



	rc = tpm2_get_cc_attrs_tbl(chip);



out: