Commit 028bd4a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tpmdd-next-6.19-rc1-v4' of... 

Merge tag 'tpmdd-next-6.19-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd

Pull tpm updates from Jarkko Sakkinen:
 "This contains changes to unify TPM return code translation between
  trusted_tpm2 and TPM driver itself. Other than that the changes are
  either bug fixes or minor imrovements"

* tag 'tpmdd-next-6.19-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
  KEYS: trusted: Use tpm_ret_to_err() in trusted_tpm2
  tpm: Use -EPERM as fallback error code in tpm_ret_to_err
  tpm: Cap the number of PCR banks
  tpm: Remove tpm_find_get_ops
  tpm: add WQ_PERCPU to alloc_workqueue users
  tpm_crb: add missing loc parameter to kerneldoc
  tpm_crb: Fix a spelling mistake
  selftests: tpm2: Fix ill defined assertions
parents 16460bf9 09b71a58

drivers/char/tpm/tpm-chip.c

+0 −37
Original line number Diff line number Diff line
@@ -230,42 +230,6 @@ struct tpm_chip *tpm_default_chip(void) 
}

EXPORT_SYMBOL_GPL(tpm_default_chip);



/**

 * tpm_find_get_ops() - find and reserve a TPM chip

 * @chip:	a &struct tpm_chip instance, %NULL for the default chip

 *

 * Finds a TPM chip and reserves its class device and operations. The chip must

 * be released with tpm_put_ops() after use.

 * This function is for internal use only. It supports existing TPM callers

 * by accepting NULL, but those callers should be converted to pass in a chip

 * directly.

 *

 * Return:

 * A reserved &struct tpm_chip instance.

 * %NULL if a chip is not found.

 * %NULL if the chip is not available.

 */

struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip)

{

	int rc;



	if (chip) {

		if (!tpm_try_get_ops(chip))

			return chip;

		return NULL;

	}



	chip = tpm_default_chip();

	if (!chip)

		return NULL;

	rc = tpm_try_get_ops(chip);

	/* release additional reference we got from tpm_default_chip() */

	put_device(&chip->dev);

	if (rc)

		return NULL;

	return chip;

}



/**

 * tpm_dev_release() - free chip memory and the device number

 * @dev: the character device for the TPM chip
@@ -282,7 +246,6 @@ static void tpm_dev_release(struct device *dev) 


	kfree(chip->work_space.context_buf);

	kfree(chip->work_space.session_buf);

	kfree(chip->allocated_banks);

#ifdef CONFIG_TCG_TPM2_HMAC

	kfree(chip->auth);

#endif

drivers/char/tpm/tpm-dev-common.c

+2 −1
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ void tpm_common_release(struct file *file, struct file_priv *priv) 


int __init tpm_dev_common_init(void)

{

	tpm_dev_wq = alloc_workqueue("tpm_dev_wq", WQ_MEM_RECLAIM, 0);

	tpm_dev_wq = alloc_workqueue("tpm_dev_wq", WQ_MEM_RECLAIM | WQ_PERCPU,

				     0);



	return !tpm_dev_wq ? -ENOMEM : 0;

}

drivers/char/tpm/tpm-interface.c

+16 −4
Original line number Diff line number Diff line
@@ -313,10 +313,13 @@ int tpm_is_tpm2(struct tpm_chip *chip) 
{

	int rc;



	chip = tpm_find_get_ops(chip);

	if (!chip)

		return -ENODEV;



	rc = tpm_try_get_ops(chip);

	if (rc)

		return rc;



	rc = (chip->flags & TPM_CHIP_FLAG_TPM2) != 0;



	tpm_put_ops(chip);
@@ -338,10 +341,13 @@ int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx, 
{

	int rc;



	chip = tpm_find_get_ops(chip);

	if (!chip)

		return -ENODEV;



	rc = tpm_try_get_ops(chip);

	if (rc)

		return rc;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		rc = tpm2_pcr_read(chip, pcr_idx, digest, NULL);

	else
@@ -369,10 +375,13 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, 
	int rc;

	int i;



	chip = tpm_find_get_ops(chip);

	if (!chip)

		return -ENODEV;



	rc = tpm_try_get_ops(chip);

	if (rc)

		return rc;



	for (i = 0; i < chip->nr_allocated_banks; i++) {

		if (digests[i].alg_id != chip->allocated_banks[i].alg_id) {

			rc = -EINVAL;
@@ -492,10 +501,13 @@ int tpm_get_random(struct tpm_chip *chip, u8 *out, size_t max) 
	if (!out || max > TPM_MAX_RNG_DATA)

		return -EINVAL;



	chip = tpm_find_get_ops(chip);

	if (!chip)

		return -ENODEV;



	rc = tpm_try_get_ops(chip);

	if (rc)

		return rc;



	if (chip->flags & TPM_CHIP_FLAG_TPM2)

		rc = tpm2_get_random(chip, out, max);

	else

drivers/char/tpm/tpm.h

+0 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static inline void tpm_msleep(unsigned int delay_msec) 
int tpm_chip_bootstrap(struct tpm_chip *chip);

int tpm_chip_start(struct tpm_chip *chip);

void tpm_chip_stop(struct tpm_chip *chip);

struct tpm_chip *tpm_find_get_ops(struct tpm_chip *chip);



struct tpm_chip *tpm_chip_alloc(struct device *dev,

				const struct tpm_class_ops *ops);

drivers/char/tpm/tpm1-cmd.c

+0 −5
Original line number Diff line number Diff line
@@ -799,11 +799,6 @@ int tpm1_pm_suspend(struct tpm_chip *chip, u32 tpm_suspend_pcr) 
 */

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;