[saucy][Pull request] SAUCE: apparmor3 sync for the mako kernel
John Johansen
john.johansen at canonical.com
Tue Jun 25 13:01:12 UTC 2013
This is the backport of the apparmor3 module to the 3.4 based mako kernel
The following changes since commit 21a5f372d7b2b7b40ab65011dec4d92e23a8fb91:
UBUNTU: do_tools=false when cross compiling (2013-06-20 11:10:32 -0600)
are available in the git repository at:
git://kernel.ubuntu.com/jj/ubuntu-saucy.git mako-apparmor3
for you to fetch changes up to 8bd16c67ac01a2d0ae47d57d261b18568b6cdd5e:
UBUNTU SAUCE: apparmor: 3.4 backport of apparmor3 (2013-06-25 02:54:33 -0700)
----------------------------------------------------------------
John Johansen (1):
UBUNTU SAUCE: apparmor: 3.4 backport of apparmor3
debian.mako/config/config.common.ubuntu | 2 +
security/apparmor/.gitignore | 1 -
security/apparmor/Kconfig | 35 ++
security/apparmor/Makefile | 42 ++-
security/apparmor/apparmorfs.c | 757 +++++++++++++++++++++++++++++++++++++-
security/apparmor/audit.c | 65 ++--
security/apparmor/capability.c | 10 +-
security/apparmor/context.c | 122 +++---
security/apparmor/domain.c | 164 +++++----
security/apparmor/file.c | 227 +++++++-----
security/apparmor/include/apparmor.h | 59 ++-
security/apparmor/include/apparmorfs.h | 39 ++
security/apparmor/include/audit.h | 31 +-
security/apparmor/include/backport.h | 62 ++++
security/apparmor/include/context.h | 158 +++++---
security/apparmor/include/domain.h | 2 +
security/apparmor/include/file.h | 27 +-
security/apparmor/include/ipc.h | 4 +-
security/apparmor/include/label.h | 325 ++++++++++++++++
security/apparmor/include/match.h | 21 +-
security/apparmor/include/mount.h | 54 +++
security/apparmor/include/net.h | 54 +++
security/apparmor/include/path.h | 2 +-
security/apparmor/include/policy.h | 214 ++++++-----
security/apparmor/include/policy_unpack.h | 21 +-
security/apparmor/include/procattr.h | 3 +-
security/apparmor/include/resource.h | 4 +-
security/apparmor/include/sid.h | 4 +-
security/apparmor/ipc.c | 54 +--
security/apparmor/label.c | 1572 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
security/apparmor/lib.c | 41 ++-
security/apparmor/lsm.c | 659 ++++++++++++++++++++++++++++-----
security/apparmor/match.c | 23 +-
security/apparmor/mount.c | 704 +++++++++++++++++++++++++++++++++++
security/apparmor/net.c | 169 +++++++++
security/apparmor/path.c | 4 +-
security/apparmor/policy.c | 855 ++++++++++++++++++++++++++----------------
security/apparmor/policy_unpack.c | 200 +++++++---
security/apparmor/procattr.c | 57 +--
security/apparmor/resource.c | 97 +++--
40 files changed, 5927 insertions(+), 1017 deletions(-)
create mode 100644 security/apparmor/include/backport.h
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/label.c
create mode 100644 security/apparmor/mount.c
create mode 100644 security/apparmor/net.c
More information about the kernel-team
mailing list