mbox

[PULL,saucy,manta] apparmor 3 alpha4 sync

Message ID 520E66A8.1080901@canonical.com
State New
Headers show

Pull-request

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

Message

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

  UBUNTU: Ubuntu-3.4.0-4.17 (2013-08-08 09:44:52 -0600)

are available in the git repository at:

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

for you to fetch changes up to 8b3344db033691f39761179bf23ea75571bbe926:

  UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot (2013-08-15 12:31:37 -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.manta/config/config.common.ubuntu |   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 ++-
 18 files changed, 359 insertions(+), 580 deletions(-)
 create mode 100644 security/apparmor/crypto.c
 create mode 100644 security/apparmor/include/crypto.h

Comments

Tim Gardner Aug. 16, 2013, 6:32 p.m. UTC | #1