linux/security/apparmor
Linus Torvalds e7691a1ce3 Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
* 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: (32 commits)
  ima: fix invalid memory reference
  ima: free duplicate measurement memory
  security: update security_file_mmap() docs
  selinux: Casting (void *) value returned by kmalloc is useless
  apparmor: fix module parameter handling
  Security: tomoyo: add .gitignore file
  tomoyo: add missing rcu_dereference()
  apparmor: add missing rcu_dereference()
  evm: prevent racing during tfm allocation
  evm: key must be set once during initialization
  mpi/mpi-mpow: NULL dereference on allocation failure
  digsig: build dependency fix
  KEYS: Give key types their own lockdep class for key->sem
  TPM: fix transmit_cmd error logic
  TPM: NSC and TIS drivers X86 dependency fix
  TPM: Export wait_for_stat for other vendor specific drivers
  TPM: Use vendor specific function for status probe
  tpm_tis: add delay after aborting command
  tpm_tis: Check return code from getting timeouts/durations
  tpm: Introduce function to poll for result of self test
  ...

Fix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI
and SIGSIG next to CONFIG_DQL addition.
2012-01-10 21:51:23 -08:00
..
include Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
.gitignore .gitignore: ignore apparmor/rlim_names.h 2010-10-21 10:12:35 +11:00
Kconfig apparmor: depends on NET 2010-08-05 07:36:51 -04:00
Makefile AppArmor: cleanup generated files correctly 2011-03-08 17:03:53 -08:00
apparmorfs.c switch securityfs_create_file() to umode_t 2012-01-03 22:55:13 -05:00
audit.c apparmor: add missing rcu_dereference() 2011-12-09 12:08:41 +11:00
capability.c AppArmor: mediation of non file objects 2010-08-02 15:38:35 +10:00
context.c AppArmor: contexts used in attaching policy to system objects 2010-08-02 15:35:12 +10:00
domain.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 2011-07-27 19:26:38 -07:00
file.c AppArmor: file enforcement routines 2010-08-02 15:35:14 +10:00
ipc.c apparmor: sparse fix: include ipc.h 2011-09-09 16:56:27 -07:00
lib.c apparmor: sparse fix: add apparmor.h to lib.c 2011-09-09 16:56:28 -07:00
lsm.c Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security 2012-01-10 21:51:23 -08:00
match.c Create Documentation/security/, 2011-05-19 15:59:38 -07:00
path.c btrfs, nfs, apparmor: don't pull mnt_namespace.h for no reason... 2012-01-03 22:52:38 -05:00
policy.c APPARMOR: Fix memory leak of alloc_namespace() 2010-11-11 07:36:18 +11:00
policy_unpack.c apparmor: sparse fix: rename shadowed variables in policy_unpack.c 2011-09-09 16:56:28 -07:00
procattr.c apparmor: sparse fix: include procattr.h in procattr.c 2011-09-09 16:56:29 -07:00
resource.c AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes 2010-09-08 09:19:29 +10:00
sid.c AppArmor: core policy routines 2010-08-02 15:38:37 +10:00