lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TPM: integrity fix

Browse Source 
Fix to function which is called by IMA, now tpm_chip_find_get() considers the case in which the machine doesn't have a TPM or, if it has, its TPM isn't enabled.

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Rajiv Andrade
2009-02-05 13:06:30 -02:00
committed by James Morris
parent 64c61d80a6
commit 8920d5ad6b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -666,18 +666,20 @@ EXPORT_SYMBOL_GPL(tpm_show_temp_deactivated);
*/ */
static struct tpm_chip *tpm_chip_find_get(int chip_num) static struct tpm_chip *tpm_chip_find_get(int chip_num)
{ {
struct tpm_chip *pos; struct tpm_chip *pos, *chip = NULL;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(pos, &tpm_chip_list, list) { list_for_each_entry_rcu(pos, &tpm_chip_list, list) {
if (chip_num != TPM_ANY_NUM && chip_num != pos->dev_num) if (chip_num != TPM_ANY_NUM && chip_num != pos->dev_num)
continue; continue;
if (try_module_get(pos->dev->driver->owner)) if (try_module_get(pos->dev->driver->owner)) {
chip = pos;
break; break;
}
} }
rcu_read_unlock(); rcu_read_unlock();
return pos; return chip;
} }
#define TPM_ORDINAL_PCRREAD cpu_to_be32(21) #define TPM_ORDINAL_PCRREAD cpu_to_be32(21)