The patch titled
tpm: integrity fix
has been added to the -mm tree. Its filename is
tpm-integrity-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: tpm: integrity fix
From: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>
Fix to a 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@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>
Acked-by: Serge Hallyn <serue@xxxxxxxxxx>
Cc: <safford@xxxxxxxxxxxxxx>
Cc: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/tpm/tpm.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff -puN drivers/char/tpm/tpm.c~tpm-integrity-fix drivers/char/tpm/tpm.c
--- a/drivers/char/tpm/tpm.c~tpm-integrity-fix
+++ a/drivers/char/tpm/tpm.c
@@ -666,18 +666,20 @@ EXPORT_SYMBOL_GPL(tpm_show_temp_deactiva
*/
static struct tpm_chip *tpm_chip_find_get(int chip_num)
{
- struct tpm_chip *pos;
+ struct tpm_chip *pos, *chip = NULL;
rcu_read_lock();
list_for_each_entry_rcu(pos, &tpm_chip_list, list) {
if (chip_num != TPM_ANY_NUM && chip_num != pos->dev_num)
continue;
- if (try_module_get(pos->dev->driver->owner))
+ if (try_module_get(pos->dev->driver->owner)) {
+ chip = pos;
break;
+ }
}
rcu_read_unlock();
- return pos;
+ return chip;
}
#define TPM_ORDINAL_PCRREAD cpu_to_be32(21)
_
Patches currently in -mm which might be from srajiv@xxxxxxxxxxxxxxxxxx are
linux-next.patch
tpm-integrity-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
