[PULL][saucy][maguro] apparmor 3 alpha4 sync
John Johansen
john.johansen at canonical.com
Fri Aug 16 17:51:16 UTC 2013
The following changes since commit be7cab1c870cdadfa95158616e0042b8adf8003d:
UBUNTU: Ubuntu-maguro-3.0.0-3.15 (2013-08-08 09:17:42 -0600)
are available in the git repository at:
git://kernel.ubuntu.com/jj/ubuntu-saucy.git maguro-apparmor3
for you to fetch changes up to d4f26a386d6cb05e273d81ec47ec32d9718b30a0:
UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot (2013-08-15 12:03:19 -0700)
----------------------------------------------------------------
John Johansen (4):
Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users"
Revert "UBUNTU: SAUCE: apparmor: 3.0 backport fix list_splice_init_rcu 7f708931"
Revert "UBUNTU: SAUCE: apparmor: 3.0 backport of apparmor3"
UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot
debian.maguro/config/config.common.ubuntu | 1 +
security/apparmor/Kconfig | 12 +
security/apparmor/Makefile | 31 +-
security/apparmor/apparmorfs.c | 55 ++-
security/apparmor/capability.c | 5 +
security/apparmor/crypto.c | 97 +++++
security/apparmor/domain.c | 2 +-
security/apparmor/include/apparmorfs.h | 1 +
security/apparmor/include/capability.h | 4 +
security/apparmor/include/crypto.h | 36 ++
security/apparmor/include/file.h | 4 +-
security/apparmor/include/label.h | 17 +-
security/apparmor/include/policy.h | 4 +-
security/apparmor/label.c | 569 +++++-------------------------
security/apparmor/lib.c | 5 -
security/apparmor/lsm.c | 24 +-
security/apparmor/policy.c | 34 +-
security/apparmor/policy_unpack.c | 38 +-
18 files changed, 359 insertions(+), 580 deletions(-)
create mode 100644 security/apparmor/crypto.c
create mode 100644 security/apparmor/include/crypto.h
More information about the kernel-team
mailing list