Patchwork [PULL,saucy,mako] apparmor 3 alpha4 sync

login
register
mail settings
Submitter John Johansen
Date Aug. 16, 2013, 5:51 p.m.
Message ID <520E66B1.1030305@canonical.com>
Download mbox
Permalink /patch/267731/
State New
Headers show

Pull-request

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

Comments

John Johansen - Aug. 16, 2013, 5:51 p.m.
The following changes since commit f75ecd9abf037d6c3258bcba8011575dd18252d4:

  UBUNTU: Ubuntu-mako-3.4.0-3.19 (2013-08-08 09:31:07 -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 1ae6ececc82ff80dc4b399603640fec6b9626c04:

  UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot (2013-08-15 12:29:56 -0700)

----------------------------------------------------------------
John Johansen (3):
      Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users"
      Revert "UBUNTU: SAUCE: apparmor: 3.4 backport of apparmor3"
      UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot

 debian.mako/config/config.common.ubuntu |   1 +
 security/apparmor/.gitignore            |   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 ++-
 19 files changed, 360 insertions(+), 580 deletions(-)
 create mode 100644 security/apparmor/crypto.c
 create mode 100644 security/apparmor/include/crypto.h
Tim Gardner - Aug. 16, 2013, 6:27 p.m.