mirror of
https://github.com/torvalds/linux
synced 2024-07-21 10:41:44 +00:00
tpm: Remove tpm_send()
Open code the last remaining call site for tpm_send(). Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Tested-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
This commit is contained in:
parent
cf792e903a
commit
4f0feb5463
|
@ -342,31 +342,6 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(tpm_pcr_extend);
|
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 tpm_auto_startup(struct tpm_chip *chip)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
|
|
|
@ -422,7 +422,6 @@ extern int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx,
|
||||||
struct tpm_digest *digest);
|
struct tpm_digest *digest);
|
||||||
extern int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,
|
extern int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,
|
||||||
struct tpm_digest *digests);
|
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 int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max);
|
||||||
extern struct tpm_chip *tpm_default_chip(void);
|
extern struct tpm_chip *tpm_default_chip(void);
|
||||||
void tpm2_flush_context(struct tpm_chip *chip, u32 handle);
|
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;
|
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)
|
static inline int tpm_get_random(struct tpm_chip *chip, u8 *data, size_t max)
|
||||||
{
|
{
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
|
@ -356,17 +356,27 @@ static int TSS_checkhmac2(unsigned char *buffer,
|
||||||
*/
|
*/
|
||||||
int trusted_tpm_send(unsigned char *cmd, size_t buflen)
|
int trusted_tpm_send(unsigned char *cmd, size_t buflen)
|
||||||
{
|
{
|
||||||
|
struct tpm_buf buf;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
if (!chip)
|
if (!chip)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
rc = tpm_try_get_ops(chip);
|
||||||
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
|
||||||
|
buf.flags = 0;
|
||||||
|
buf.data = cmd;
|
||||||
dump_tpm_buf(cmd);
|
dump_tpm_buf(cmd);
|
||||||
rc = tpm_send(chip, cmd, buflen);
|
rc = tpm_transmit_cmd(chip, &buf, 4, "sending data");
|
||||||
dump_tpm_buf(cmd);
|
dump_tpm_buf(cmd);
|
||||||
|
|
||||||
if (rc > 0)
|
if (rc > 0)
|
||||||
/* Can't return positive return codes values to keyctl */
|
/* TPM error */
|
||||||
rc = -EPERM;
|
rc = -EPERM;
|
||||||
|
|
||||||
|
tpm_put_ops(chip);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(trusted_tpm_send);
|
EXPORT_SYMBOL_GPL(trusted_tpm_send);
|
||||||
|
|
Loading…
Reference in a new issue