mbox

[PULL,saucy,grouper] apparmor 3 alpha4 sync

Message ID 520E669F.60306@canonical.com
State New
Headers show

Pull-request

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

Message

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

  UBUNTU: Ubuntu-grouper-3.1.10-6.22 (2013-08-08 08:36:48 -0600)

are available in the git repository at:

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

for you to fetch changes up to 06cf4dfb8cb613f2a9941b8c0662ba22e4a57c22:

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

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

 debian.grouper/config/config.common.ubuntu |   1 +
 include/linux/lsm_audit.h                  |   4 +
 security/apparmor/.gitignore               |   1 +
 security/apparmor/Kconfig                  |  12 +
 security/apparmor/Makefile                 |  31 +-
 security/apparmor/apparmorfs-24.c          | 287 +++++++++++++++
 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/audit.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 +-
 22 files changed, 651 insertions(+), 581 deletions(-)
 create mode 100644 security/apparmor/apparmorfs-24.c
 create mode 100644 security/apparmor/crypto.c
 create mode 100644 security/apparmor/include/crypto.h

Comments

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