linux-stable.git/security/integrity/ima/Kconfig, branch linux-3.2.y

ima: fix Kconfig dependencies

2012-04-02T16:52:36+00:00

commit f4a0391dfa91155bd961673b31eb42d9d45c799d upstream.

Fix the following build warning:
warning: (IMA) selects TCG_TPM which has unmet direct dependencies
(HAS_IOMEM && EXPERIMENTAL)

Suggested-by: Rajiv Andrade 
Signed-off-by: Fabio Estevam 
Signed-off-by: Rajiv Andrade 
Signed-off-by: Mimi Zohar 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'for-linus' of git://github.com/richardweinberger/linux

2011-11-02T16:45:39+00:00

* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
  um: fix ubd cow size
  um: Fix kmalloc argument order in um/vdso/vma.c
  um: switch to use of drivers/Kconfig
  UserModeLinux-HOWTO.txt: fix a typo
  UserModeLinux-HOWTO.txt: remove ^H characters
  um: we need sys/user.h only on i386
  um: merge delay_{32,64}.c
  um: distribute exports to where exported stuff is defined
  um: kill system-um.h
  um: generic ftrace.h will do...
  um: segment.h is x86-only and needed only there
  um: asm/pda.h is not needed anymore
  um: hw_irq.h can go generic as well
  um: switch to generic-y
  um: clean Kconfig up a bit
  um: a couple of missing dependencies...
  um: kill useless argument of free_chan() and free_one_chan()
  um: unify ptrace_user.h
  um: unify KSTK_...
  um: fix gcov build breakage
  ...

um: switch to use of drivers/Kconfig

2011-11-02T13:15:41+00:00

Signed-off-by: Al Viro 
Signed-off-by: Richard Weinberger

integrity: move ima inode integrity data management

2011-07-18T16:29:38+00:00

Move the inode integrity data(iint) management up to the integrity directory
in order to share the iint among the different integrity models.

Changelog:
- don't define MAX_DIGEST_SIZE
- rename several globally visible 'ima_' prefixed functions, structs,
  locks, etc to 'integrity_'
- replace '20' with SHA1_DIGEST_SIZE
- reflect location change in appropriate Kconfig and Makefiles
- remove unnecessary initialization of iint_initialized to 0
- rebased on current ima_iint.c
- define integrity_iint_store/lock as static

There should be no other functional changes.

Signed-off-by: Mimi Zohar 
Acked-by: Serge Hallyn

ima: remove ACPI dependency

2010-05-16T23:21:58+00:00

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 
Reported-by: Jean-Christophe Dubois 
Acked-by: Serge Hallyn 
Tested-by: Serge Hallyn 
Signed-off-by: James Morris

Revert "ima: remove ACPI dependency"

2010-05-06T23:20:03+00:00

This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.

Previous revert was a prereq.

Signed-off-by: James Morris

ima: remove ACPI dependency

2010-05-05T00:00:06+00:00

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 
Reported-by: Jean-Christophe Dubois 
Acked-by: Serge Hallyn 
Tested-by: Serge Hallyn 
Signed-off-by: James Morris

LSM: imbed ima calls in the security hooks

2009-10-25T04:22:48+00:00

Based on discussions on LKML and LSM, where there are consecutive
security_ and ima_ calls in the vfs layer, move the ima_ calls to
the existing security_ hooks.

Signed-off-by: Mimi Zohar 
Signed-off-by: James Morris

ima: fix build error

2009-02-12T22:27:56+00:00

IMA_LSM_RULES requires AUDIT.  This is automatic if SECURITY_SELINUX=y
but not when SECURITY_SMACK=y (and SECURITY_SELINUX=n), so make the
dependency explicit.  This fixes the following build error:

security/integrity/ima/ima_policy.c:111:error: implicit declaration of function 'security_audit_rule_match'
security/integrity/ima/ima_policy.c:230:error: implicit declaration of function 'security_audit_rule_init'

Signed-off-by: Randy Dunlap 
Acked-by: Mimi Zohar 
Signed-off-by: James Morris

integrity: IMA policy

2009-02-05T22:05:31+00:00

Support for a user loadable policy through securityfs
with support for LSM specific policy data.
- free invalid rule in ima_parse_add_rule()

Signed-off-by: Mimi Zohar 
Acked-by: Serge Hallyn 
Signed-off-by: James Morris