linux-kernel - Re: [PATCH] TPM: integrity fix

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.LRH.1.10.0902060936560.13175@tundra.namei.org>
Date:	Fri, 6 Feb 2009 09:37:01 +1100 (EST)
From:	James Morris <jmorris@...ei.org>
To:	Rajiv Andrade <srajiv@...ux.vnet.ibm.com>
cc:	linux-kernel@...r.kernel.org, akpm@...ux-foundation.org,
	serue@...ibm.com, safford@...son.ibm.com,
	Mimi Zohar <zohar@...ux.vnet.ibm.com>
Subject: Re: [PATCH] TPM: integrity fix

On Thu, 5 Feb 2009, Rajiv Andrade wrote:

> 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.

Applied.

> 
> Signed-off-by: Mimi Zohar <zohar@...ux.vnet.ibm.com>
> Signed-off-by: Rajiv Andrade <srajiv@...ux.vnet.ibm.com>
> ---
>  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) {
>  		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
> 

-- 
James Morris
<jmorris@...ei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/