Commit 4a94c433 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tpm fixes from Jarkko Sakkinen:
 "Bunch of fixes for rc3"

* tag 'tpmdd-next-20191219' of git://git.infradead.org/users/jjs/linux-tpmdd:
  tpm/tpm_ftpm_tee: add shutdown call back
  tpm: selftest: cleanup after unseal with wrong auth/policy test
  tpm: selftest: add test covering async mode
  tpm: fix invalid locking in NONBLOCKING mode
  security: keys: trusted: fix lost handle flush
  tpm_tis: reserve chip for duration of tpm_tis_core_init
  KEYS: asymmetric: return ENOMEM if akcipher_request_alloc() fails
  KEYS: remove CONFIG_KEYS_COMPAT
parents 80a0c2e5 1760eb68

crypto/asymmetric_keys/asym_tpm.c

+1 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ static int tpm_key_encrypt(struct tpm_key *tk, 
	if (ret < 0)

		goto error_free_tfm;



	ret = -ENOMEM;

	req = akcipher_request_alloc(tfm, GFP_KERNEL);

	if (!req)

		goto error_free_tfm;

crypto/asymmetric_keys/public_key.c

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ static int software_key_eds_op(struct kernel_pkey_params *params, 
	if (IS_ERR(tfm))

		return PTR_ERR(tfm);



	ret = -ENOMEM;

	req = akcipher_request_alloc(tfm, GFP_KERNEL);

	if (!req)

		goto error_free_tfm;

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

+8 −0
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ static void tpm_dev_async_work(struct work_struct *work) 


	mutex_lock(&priv->buffer_mutex);

	priv->command_enqueued = false;

	ret = tpm_try_get_ops(priv->chip);

	if (ret) {

		priv->response_length = ret;

		goto out;

	}



	ret = tpm_dev_transmit(priv->chip, priv->space, priv->data_buffer,

			       sizeof(priv->data_buffer));

	tpm_put_ops(priv->chip);
@@ -68,6 +74,7 @@ static void tpm_dev_async_work(struct work_struct *work) 
		priv->response_length = ret;

		mod_timer(&priv->user_read_timer, jiffies + (120 * HZ));

	}

out:

	mutex_unlock(&priv->buffer_mutex);

	wake_up_interruptible(&priv->async_wait);

}
@@ -204,6 +211,7 @@ ssize_t tpm_common_write(struct file *file, const char __user *buf, 
	if (file->f_flags & O_NONBLOCK) {

		priv->command_enqueued = true;

		queue_work(tpm_dev_wq, &priv->async_work);

		tpm_put_ops(priv->chip);

		mutex_unlock(&priv->buffer_mutex);

		return size;

	}

drivers/char/tpm/tpm.h

+0 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ int tpm2_pcr_read(struct tpm_chip *chip, u32 pcr_idx, 
int tpm2_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,

		    struct tpm_digest *digests);

int tpm2_get_random(struct tpm_chip *chip, u8 *dest, size_t max);

void tpm2_flush_context(struct tpm_chip *chip, u32 handle);

ssize_t tpm2_get_tpm_pt(struct tpm_chip *chip, u32 property_id,

			u32 *value, const char *desc);

drivers/char/tpm/tpm2-cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ void tpm2_flush_context(struct tpm_chip *chip, u32 handle) 
	tpm_transmit_cmd(chip, &buf, 0, "flushing context");

	tpm_buf_destroy(&buf);

}

EXPORT_SYMBOL_GPL(tpm2_flush_context);



struct tpm2_get_cap_out {

	u8 more_data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE