android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] tpm: improve output in sysfs files when the TPM fails

Browse Source 
Since after reconsideration this is more debug output than an error (the
TPM is operating correctly given the current state) I have changed the
statements to dbg rather than err.

Also this patch corrects a memory leak if the error path is taken in the
tpm_show_pubek function.

Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Kylene Jo Hall
2005-06-23 22:02:10 -07:00
committed by Linus Torvalds
parent e234bc9704
commit 34d6e07570
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/char/tpm/tpm.c
View File

@ -147,7 +147,7 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
memcpy(data, cap_pcr, sizeof(cap_pcr)); memcpy(data, cap_pcr, sizeof(cap_pcr));
if ((len = tpm_transmit(chip, data, sizeof(data))) if ((len = tpm_transmit(chip, data, sizeof(data)))
< CAP_PCR_RESULT_SIZE) { < CAP_PCR_RESULT_SIZE) {
dev_err(&chip->pci_dev->dev, "A TPM error (%d) occurred " dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred "
"attempting to determine the number of PCRS\n", "attempting to determine the number of PCRS\n",
be32_to_cpu(*((__be32 *) (data + 6)))); be32_to_cpu(*((__be32 *) (data + 6))));
return 0; return 0;
@ -161,7 +161,7 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
memcpy(data + 10, &index, 4); memcpy(data + 10, &index, 4);
if ((len = tpm_transmit(chip, data, sizeof(data))) if ((len = tpm_transmit(chip, data, sizeof(data)))
< READ_PCR_RESULT_SIZE){ < READ_PCR_RESULT_SIZE){
dev_err(&chip->pci_dev->dev, "A TPM error (%d) occurred" dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred"
" attempting to read PCR %d of %d\n", " attempting to read PCR %d of %d\n",
be32_to_cpu(*((__be32 *) (data + 6))), i, num_pcrs); be32_to_cpu(*((__be32 *) (data + 6))), i, num_pcrs);
goto out; goto out;
@ -205,10 +205,11 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
if ((len = tpm_transmit(chip, data, READ_PUBEK_RESULT_SIZE)) < if ((len = tpm_transmit(chip, data, READ_PUBEK_RESULT_SIZE)) <
READ_PUBEK_RESULT_SIZE) { READ_PUBEK_RESULT_SIZE) {
dev_err(&chip->pci_dev->dev, "A TPM error (%d) occurred " dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred "
"attempting to read the PUBEK\n", "attempting to read the PUBEK\n",
be32_to_cpu(*((__be32 *) (data + 6)))); be32_to_cpu(*((__be32 *) (data + 6))));
return 0; rc = 0;
goto out;
} }
/* /*
@ -240,6 +241,7 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
str += sprintf(str, "\n"); str += sprintf(str, "\n");
} }
rc = str - buf; rc = str - buf;
out:
kfree(data); kfree(data);
return rc; return rc;
} }