[utopic][pull-request]: apparmor alpha 6 sync
John Johansen
john.johansen at canonical.com
Wed May 28 09:37:07 UTC 2014
The following changes since commit f903c36513cb045b706d524603d75c236f5ee3ff:
UBUNTU: Ubuntu-3.15.0-3.7 (2014-05-26 09:36:46 +0200)
are available in the git repository at:
git://kernel.ubuntu.com/jj/ubuntu-utopic.git apparmor
for you to fetch changes up to 28520587b0cc09a650b21b6874d32c5e593d71a6:
UBUNTU: SAUCE: (no-up): apparmor: use custom write_is_locked macro (2014-05-27 14:25:01 +0200)
----------------------------------------------------------------
Javier Martinez Canillas (1):
UBUNTU: SAUCE: (no-up) apparmor: fix bug that constantly spam the console
John Johansen (5):
UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - alpha6 snapshot
UBUNTU: SAUCE: (no-up) apparmor: fix apparmor spams log with warning message
UBUNTU: SAUCE: (no-up) apparmor: fix refcount bug in apparmor pivotroot
UBUNTU: SAUCE: (no-up): apparmor: fix apparmor refcount bug in apparmor_kill
UBUNTU: SAUCE: (no-up): apparmor: use custom write_is_locked macro
security/apparmor/.gitignore | 1 +
security/apparmor/Kconfig | 35 +
security/apparmor/Makefile | 40 +-
security/apparmor/apparmorfs.c | 262 ++++-
security/apparmor/audit.c | 75 +-
security/apparmor/capability.c | 52 +-
security/apparmor/context.c | 88 +-
security/apparmor/domain.c | 158 ++-
security/apparmor/file.c | 497 +++++++---
security/apparmor/include/apparmor.h | 59 +-
security/apparmor/include/apparmorfs.h | 2 +
security/apparmor/include/audit.h | 68 +-
security/apparmor/include/capability.h | 6 +-
security/apparmor/include/context.h | 160 ++--
security/apparmor/include/domain.h | 2 +
security/apparmor/include/file.h | 87 +-
security/apparmor/include/ipc.h | 22 +-
security/apparmor/include/label.h | 379 ++++++++
security/apparmor/include/match.h | 15 +
security/apparmor/include/mount.h | 54 ++
security/apparmor/include/net.h | 54 ++
security/apparmor/include/path.h | 60 +-
security/apparmor/include/perms.h | 170 ++++
security/apparmor/include/policy.h | 123 +--
security/apparmor/include/procattr.h | 2 +-
security/apparmor/include/resource.h | 4 +-
security/apparmor/include/sig_names.h | 95 ++
security/apparmor/ipc.c | 249 +++--
security/apparmor/label.c | 1646 ++++++++++++++++++++++++++++++++
security/apparmor/lib.c | 275 +++++-
security/apparmor/lsm.c | 797 ++++++++++++++--
security/apparmor/mount.c | 688 +++++++++++++
security/apparmor/net.c | 171 ++++
security/apparmor/path.c | 105 +-
security/apparmor/policy.c | 372 +++++---
security/apparmor/policy_unpack.c | 119 ++-
security/apparmor/procattr.c | 60 +-
security/apparmor/resource.c | 112 ++-
38 files changed, 6101 insertions(+), 1063 deletions(-)
create mode 100644 security/apparmor/include/label.h
create mode 100644 security/apparmor/include/mount.h
create mode 100644 security/apparmor/include/net.h
create mode 100644 security/apparmor/include/perms.h
create mode 100644 security/apparmor/include/sig_names.h
create mode 100644 security/apparmor/label.c
create mode 100644 security/apparmor/mount.c
create mode 100644 security/apparmor/net.c
More information about the kernel-team
mailing list