From: James Morris on
On Tue, 4 May 2010, Mimi Zohar wrote:

> The ACPI dependency moved to the TPM, where it belongs. Although
> IMA per-se does not require access to the bios measurement log,
> verifying the IMA boot aggregate does, which requires ACPI.
>
> This patch prereq's 'TPM: ACPI/PNP dependency removal'
> http://lkml.org/lkml/2010/5/4/378.
>
> Signed-off-by: Mimi Zohar <zohar(a)us.ibm.com>
> Reported-by: Jean-Christophe Dubois <jcd(a)tribudubois.net>
> Acked-by: Serge Hallyn <serue(a)us.ibm.com>
> Tested-by: Serge Hallyn <serue(a)us.ibm.com>


Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next


--
James Morris
<jmorris(a)namei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Mimi Zohar on
Once the 'TPM: ACPI/PNP dependency removal' patch is accepted
http://lkml.org/lkml/2010/5/13/410, please accept this previously posted
patch (with either updating the prereq URL or removing it.)

thanks,

Mimi

On Tue, 2010-05-04 at 18:16 -0400, Mimi Zohar wrote:
> The ACPI dependency moved to the TPM, where it belongs. Although
> IMA per-se does not require access to the bios measurement log,
> verifying the IMA boot aggregate does, which requires ACPI.
>
> This patch prereq's 'TPM: ACPI/PNP dependency removal'
> http://lkml.org/lkml/2010/5/4/378.
>
> Signed-off-by: Mimi Zohar <zohar(a)us.ibm.com>
> Reported-by: Jean-Christophe Dubois <jcd(a)tribudubois.net>
> Acked-by: Serge Hallyn <serue(a)us.ibm.com>
> Tested-by: Serge Hallyn <serue(a)us.ibm.com>
> ---
> security/integrity/ima/Kconfig | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
> index 3d7846d..b6ecfd4 100644
> --- a/security/integrity/ima/Kconfig
> +++ b/security/integrity/ima/Kconfig
> @@ -2,15 +2,14 @@
> #
> config IMA
> bool "Integrity Measurement Architecture(IMA)"
> - depends on ACPI
> depends on SECURITY
> select SECURITYFS
> select CRYPTO
> select CRYPTO_HMAC
> select CRYPTO_MD5
> select CRYPTO_SHA1
> - select TCG_TPM
> - select TCG_TIS
> + select TCG_TPM if !S390
> + select TCG_TIS if TCG_TPM
> help
> The Trusted Computing Group(TCG) runtime Integrity
> Measurement Architecture(IMA) maintains a list of hash


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: James Morris on
On Fri, 14 May 2010, Mimi Zohar wrote:

> Once the 'TPM: ACPI/PNP dependency removal' patch is accepted
> http://lkml.org/lkml/2010/5/13/410, please accept this previously posted
> patch (with either updating the prereq URL or removing it.)
>

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

>
> On Tue, 2010-05-04 at 18:16 -0400, Mimi Zohar wrote:
> > The ACPI dependency moved to the TPM, where it belongs. Although
> > IMA per-se does not require access to the bios measurement log,
> > verifying the IMA boot aggregate does, which requires ACPI.
> >
> > This patch prereq's 'TPM: ACPI/PNP dependency removal'
> > http://lkml.org/lkml/2010/5/4/378.
> >
> > Signed-off-by: Mimi Zohar <zohar(a)us.ibm.com>
> > Reported-by: Jean-Christophe Dubois <jcd(a)tribudubois.net>
> > Acked-by: Serge Hallyn <serue(a)us.ibm.com>
> > Tested-by: Serge Hallyn <serue(a)us.ibm.com>
> > ---
> > security/integrity/ima/Kconfig | 5 ++---
> > 1 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
> > index 3d7846d..b6ecfd4 100644
> > --- a/security/integrity/ima/Kconfig
> > +++ b/security/integrity/ima/Kconfig
> > @@ -2,15 +2,14 @@
> > #
> > config IMA
> > bool "Integrity Measurement Architecture(IMA)"
> > - depends on ACPI
> > depends on SECURITY
> > select SECURITYFS
> > select CRYPTO
> > select CRYPTO_HMAC
> > select CRYPTO_MD5
> > select CRYPTO_SHA1
> > - select TCG_TPM
> > - select TCG_TIS
> > + select TCG_TPM if !S390
> > + select TCG_TIS if TCG_TPM
> > help
> > The Trusted Computing Group(TCG) runtime Integrity
> > Measurement Architecture(IMA) maintains a list of hash
>
>

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