[GIT PULL][UTOPIC][MANTA] AppArmor sync to apparmor3 - RC1 snapshot
Tyler Hicks
tyhicks at canonical.com
Sat Sep 20 00:35:19 UTC 2014
This cleans up several functions over the alpha6 sync, and includes multiple
bug fixes. In addition it picks up
- new network mediation
- fine grained mediation of all unix socket types
While I've prepared the branch and pull request, it should be noted that John
Johansen authored nearly all of the code. We've written an extensive set of
unix socket tests for both the parser and the kernel mediation code. The
required userspace changes (parser, utilities, and policy) have already landed
in Utopic and have been tested with these kernel changes. Please see
LP: #1362199 for more information.
The individual, non-squashed patches can be found with the apparmor-3.RC1 tag
in git://kernel.ubuntu.com/jj/ubuntu-utopic.git
The following changes since commit 94da4adef65fcfa6986a32496550d5676e69c956:
Revert "UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 6 snapshot" (2014-09-19 10:36:54 -0600)
are available in the git repository at:
git://kernel.ubuntu.com/tyhicks/ubuntu-utopic.git manta-aa3-backport
for you to fetch changes up to 5f43a52c3635b96d9de5fba783e5296d6564ca02:
UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - RC1 snapshot (2014-09-19 18:21:38 -0500)
----------------------------------------------------------------
John Johansen (1):
UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - RC1 snapshot
security/apparmor/.gitignore | 2 +-
security/apparmor/Kconfig | 47 +
security/apparmor/Makefile | 50 +-
security/apparmor/af_unix.c | 632 ++++++++++
security/apparmor/apparmorfs.c | 922 ++++++++++++++-
security/apparmor/audit.c | 84 +-
security/apparmor/backport.c | 138 +++
security/apparmor/capability.c | 62 +-
security/apparmor/context.c | 122 +-
security/apparmor/crypto.c | 95 ++
security/apparmor/domain.c | 230 ++--
security/apparmor/file.c | 563 ++++++---
security/apparmor/include/af_unix.h | 121 ++
security/apparmor/include/apparmor.h | 79 +-
security/apparmor/include/apparmorfs.h | 42 +
security/apparmor/include/audit.h | 74 +-
security/apparmor/include/backport.h | 68 ++
security/apparmor/include/capability.h | 13 +-
security/apparmor/include/context.h | 208 ++--
security/apparmor/include/crypto.h | 36 +
security/apparmor/include/domain.h | 2 +
security/apparmor/include/file.h | 108 +-
security/apparmor/include/ipc.h | 22 +-
security/apparmor/include/label.h | 419 +++++++
security/apparmor/include/match.h | 36 +-
security/apparmor/include/mount.h | 54 +
security/apparmor/include/net.h | 110 ++
security/apparmor/include/path.h | 63 +-
security/apparmor/include/perms.h | 174 +++
security/apparmor/include/policy.h | 267 +++--
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/include/sig_names.h | 95 ++
security/apparmor/ipc.c | 247 ++--
security/apparmor/label.c | 1844 +++++++++++++++++++++++++++++
security/apparmor/lib.c | 458 ++++++-
security/apparmor/lsm.c | 888 +++++++++++---
security/apparmor/match.c | 23 +-
security/apparmor/mount.c | 703 +++++++++++
security/apparmor/net.c | 397 +++++++
security/apparmor/path.c | 173 ++-
security/apparmor/policy.c | 907 ++++++++------
security/apparmor/policy_unpack.c | 244 +++-
security/apparmor/procattr.c | 66 +-
security/apparmor/resource.c | 117 +-
47 files changed, 9561 insertions(+), 1476 deletions(-)
create mode 100644 security/apparmor/af_unix.c
create mode 100644 security/apparmor/backport.c
create mode 100644 security/apparmor/crypto.c
create mode 100644 security/apparmor/include/af_unix.h
create mode 100644 security/apparmor/include/backport.h
create mode 100644 security/apparmor/include/crypto.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/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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20140919/cad2967a/attachment.sig>
More information about the kernel-team
mailing list