Patchwork [saucy,Pull,request] SAUCE: Sync to apparmor 3 dev stable snapshot

login
register
mail settings
Submitter John Johansen
Date June 28, 2013, 6:40 a.m.
Message ID <51CD2FD4.8060504@jjmx.net>
Download mbox
Permalink /patch/255320/
State New
Headers show

Pull-request

git://kernel.ubuntu.com/jj/ubuntu-saucy/ saucy-apparmor3

Comments

John Johansen - June 28, 2013, 6:40 a.m.
This is a sync to the apparmor 3 development snapshot which
is a squash of several commits in the apparmor development tree.
Please see
   8591e3d UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot
for details of the patches in the squash

Several of the patches in the squash have been submitted upstream.
Several more will be submitted soon, and other parts are still in
active review and development.

This squash will be updated to remove patches as they are pulled
into the upstream tree, and add new patches as they become available
to the stable apparmor dev branch.

Signed-off-by: John Johansen <john.johansen@canonical.com>

---

The following changes since commit 0934325265cbd13995e6e0d6412334a2eeb21eeb:

  UBUNTU: Ubuntu-3.10.0-0.7 (2013-06-25 09:11:13 +0100)

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-saucy/ saucy-apparmor3

for you to fetch changes up to 8591e3da7e4c9fb5e1ae64d1f8a8d7fe30e41dbd:

  UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot (2013-06-27 23:12:10 -0700)

----------------------------------------------------------------
John Johansen (7):
      Revert "UBUNTU: SAUCE: (no-up) apparmor: Fix quieting of audit messages for network mediation"
      Revert "UBUNTU: SAUCE: (no-up) apparmor: Fix compile warnings"
      Revert "UBUNTU: SAUCE: (no-up) AppArmor: basic networking rules"
      Revert "UBUNTU: SAUCE: (no-up) apparmor: Add the ability to mediate mount"
      Revert "UBUNTU: SAUCE: (no-up) AppArmor: Add profile introspection file to interface"
      Revert "UBUNTU: SAUCE: (no-up) AppArmor: Disable Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs"
      UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot

 debian.master/config/config.common.ubuntu |    2 +
 security/apparmor/Kconfig                 |   35 +
 security/apparmor/Makefile                |    3 +-
 security/apparmor/apparmorfs.c            |  574 +++++++++-
 security/apparmor/audit.c                 |   64 +-
 security/apparmor/capability.c            |    8 +-
 security/apparmor/context.c               |  122 +--
 security/apparmor/domain.c                |  125 +--
 security/apparmor/file.c                  |  211 ++--
 security/apparmor/include/apparmor.h      |   55 +-
 security/apparmor/include/apparmorfs.h    |   39 +
 security/apparmor/include/audit.h         |    9 +-
 security/apparmor/include/context.h       |  158 ++-
 security/apparmor/include/file.h          |   23 +-
 security/apparmor/include/ipc.h           |    4 +-
 security/apparmor/include/label.h         |  325 ++++++
 security/apparmor/include/match.h         |   21 +-
 security/apparmor/include/mount.h         |   16 +-
 security/apparmor/include/net.h           |   12 +-
 security/apparmor/include/path.h          |    2 +-
 security/apparmor/include/policy.h        |  211 ++--
 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                   |   52 +-
 security/apparmor/label.c                 | 1626 +++++++++++++++++++++++++++++
 security/apparmor/lib.c                   |   39 +-
 security/apparmor/lsm.c                   |  526 ++++++++--
 security/apparmor/match.c                 |   23 +-
 security/apparmor/mount.c                 |  362 ++++---
 security/apparmor/net.c                   |   55 +-
 security/apparmor/path.c                  |    2 +-
 security/apparmor/policy.c                |  874 ++++++++++------
 security/apparmor/policy_unpack.c         |  152 ++-
 security/apparmor/procattr.c              |   57 +-
 security/apparmor/resource.c              |   95 +-
 37 files changed, 4670 insertions(+), 1244 deletions(-)
 create mode 100644 security/apparmor/include/label.h
 create mode 100644 security/apparmor/label.c
Tim Gardner - June 28, 2013, 3:08 p.m.