Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  ima: always maintain counters
  AppArmor: Fix locking from removal of profile namespace
  AppArmor: Fix splitting an fqname into separate namespace and profile names
  AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes
  AppArmor: Drop hack to remove appended " (deleted)" string

...

This commit is contained in:

Linus Torvalds 2010-09-07 19:13:06 -07:00

parent d56557af19 e950598d43

commit e6f901bb85

9 changed files with 40 additions and 45 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

security/apparmor/include/resource.h

View file

2

security/apparmor/lib.c

View file

2

security/apparmor/lsm.c

View file

38

security/apparmor/path.c

View file

6

security/apparmor/policy.c

View file

20

security/apparmor/resource.c

View file

1

security/integrity/ima/ima.h

View file

4

security/integrity/ima/ima_iint.c

View file

8

security/integrity/ima/ima_main.c

View file