Commit 4f0feb54 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm: Remove tpm_send() 



Open code the last remaining call site for tpm_send().

Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Reviewed-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Tested-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
parent cf792e90

drivers/char/tpm/tpm-interface.c

+0 −25
Original line number Diff line number Diff line
@@ -342,31 +342,6 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, 
}

EXPORT_SYMBOL_GPL(tpm_pcr_extend);



/**

 * tpm_send - send a TPM command

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

 * @cmd:	a TPM command buffer

 * @buflen:	the length of the TPM command buffer

 *

 * Return: same as with tpm_transmit_cmd()

 */

int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)

{

	struct tpm_buf buf;

	int rc;



	chip = tpm_find_get_ops(chip);

	if (!chip)

		return -ENODEV;



	buf.data = cmd;

	rc = tpm_transmit_cmd(chip, &buf, 0, "attempting to a send a command");



	tpm_put_ops(chip);

	return rc;

}

EXPORT_SYMBOL_GPL(tpm_send);



int tpm_auto_startup(struct tpm_chip *chip)

{

	int rc;

include/linux/tpm.h

+0 −5
Original line number Diff line number Diff line
@@ -422,7 +422,6 @@ extern int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx, 
			struct tpm_digest *digest);

extern int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,

			  struct tpm_digest *digests);

extern int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen);

extern int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max);

extern struct tpm_chip *tpm_default_chip(void);

void tpm2_flush_context(struct tpm_chip *chip, u32 handle);
@@ -443,10 +442,6 @@ static inline int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx, 
	return -ENODEV;

}



static inline int tpm_send(struct tpm_chip *chip, void *cmd, size_t buflen)

{

	return -ENODEV;

}

static inline int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max)

{

	return -ENODEV;

security/keys/trusted-keys/trusted_tpm1.c

+12 −2
Original line number Diff line number Diff line
@@ -356,17 +356,27 @@ static int TSS_checkhmac2(unsigned char *buffer, 
 */

int trusted_tpm_send(unsigned char *cmd, size_t buflen)

{

	struct tpm_buf buf;

	int rc;



	if (!chip)

		return -ENODEV;



	rc = tpm_try_get_ops(chip);

	if (rc)

		return rc;



	buf.flags = 0;

	buf.data = cmd;

	dump_tpm_buf(cmd);

	rc = tpm_send(chip, cmd, buflen);

	rc = tpm_transmit_cmd(chip, &buf, 4, "sending data");

	dump_tpm_buf(cmd);



	if (rc > 0)

		/* Can't return positive return codes values to keyctl */

		/* TPM error */

		rc = -EPERM;



	tpm_put_ops(chip);

	return rc;

}

EXPORT_SYMBOL_GPL(trusted_tpm_send);