From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758710AbZBEQGS (ORCPT ); Thu, 5 Feb 2009 11:06:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753170AbZBEQGA (ORCPT ); Thu, 5 Feb 2009 11:06:00 -0500 Received: from e24smtp04.br.ibm.com ([32.104.18.25]:59324 "EHLO e24smtp04.br.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645AbZBEQGA (ORCPT ); Thu, 5 Feb 2009 11:06:00 -0500 Message-ID: <498B0E5A.1020709@linux.vnet.ibm.com> Date: Thu, 05 Feb 2009 14:05:46 -0200 From: Rajiv Andrade User-Agent: Thunderbird 2.0.0.14 (X11/20080722) MIME-Version: 1.0 To: "Serge E. Hallyn" CC: linux-kernel@vger.kernel.org, jmorris@namei.org, akpm@linux-foundation.org, safford@watson.ibm.com, Mimi Zohar Subject: Re: [PATCH] TPM: integrity fix References: <1233846390-21146-1-git-send-email-srajiv@linux.vnet.ibm.com> <20090205152624.GA27410@us.ibm.com> In-Reply-To: <20090205152624.GA27410@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Serge E. Hallyn wrote: > Quoting Rajiv Andrade (srajiv@linux.vnet.ibm.com): > >> 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 >> Signed-off-by: Rajiv Andrade >> > > Is this to fix James' problem with IMA on bootup? > > Yes. > Acked-by: Serge Hallyn > > >> --- >> drivers/char/tpm/tpm.c | 8 +++++--- >> 1 files changed, 5 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c >> index 0387965..912a473 100644 >> --- a/drivers/char/tpm/tpm.c >> +++ b/drivers/char/tpm/tpm.c >> @@ -666,18 +666,20 @@ EXPORT_SYMBOL_GPL(tpm_show_temp_deactivated); >> */ >> 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) { >> > > Crap I even paused for a second when I reviewed the original > patch. I think the conversation in my head went something like > "but will pos be NULL at the end of the loop?" "Oh, it must". gah. > > Yeah, I thought the same and let it pass by.. Rajiv >> 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) >> -- >> 1.5.6.3 >>