[Saucy,unstable] SAUCE: apparmor3 sync for the saucy unstable (3.11) kernel

Submitted by John Johansen on Aug. 2, 2013, 9:18 a.m.

Details

Message ID 51FB7967.9050006@canonical.com
State New
Headers show

Pull-request

ssh://kernel.ubuntu.com/srv/kernel.ubuntu.com/git/jj/ubuntu-saucy.git unstable

Commit Message

John Johansen Aug. 2, 2013, 9:18 a.m.
This is the apparmor3 patches against the 3.11 kernel in saucy unstable.
This is basically the alpha3 sync that is currently in saucy it just
just drops the 20 or so patches from the squash that made it into 3.11,
and has a couple of minor other changes from 3.11


The following changes since commit 864d97a94d933105aa0563001d82d1aa631ae540:

  UBUNTU: rebase to v3.11-rc3 (2013-07-29 12:08:15 -0400)

are available in the git repository at:

  ssh://kernel.ubuntu.com/srv/kernel.ubuntu.com/git/jj/ubuntu-saucy.git unstable

for you to fetch changes up to 6593d39ae9ef051f4af3a3a45222b8371b8ff8c8:

  UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot (2013-07-29 23:37:35 -0700)

----------------------------------------------------------------
John Johansen (1):
      UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot

 debian.master/config/config.common.ubuntu |    2 +
 security/apparmor/.gitignore              |    1 +
 security/apparmor/Kconfig                 |   35 +
 security/apparmor/Makefile                |   42 +-
 security/apparmor/apparmorfs.c            |  757 +++++++++++++-
 security/apparmor/audit.c                 |   28 +-
 security/apparmor/context.c               |   94 +-
 security/apparmor/domain.c                |  101 +-
 security/apparmor/file.c                  |  173 +--
 security/apparmor/include/apparmor.h      |   46 +-
 security/apparmor/include/apparmorfs.h    |   39 +
 security/apparmor/include/audit.h         |   21 +-
 security/apparmor/include/context.h       |  127 ++-
 security/apparmor/include/domain.h        |    2 +
 security/apparmor/include/file.h          |    9 +-
 security/apparmor/include/ipc.h           |    4 +-
 security/apparmor/include/label.h         |  325 ++++++
 security/apparmor/include/mount.h         |   54 +
 security/apparmor/include/net.h           |   54 +
 security/apparmor/include/path.h          |    2 +-
 security/apparmor/include/policy.h        |  198 ++--
 security/apparmor/include/policy_unpack.h |   21 +-
 security/apparmor/include/procattr.h      |    2 +-
 security/apparmor/include/resource.h      |    4 +-
 security/apparmor/ipc.c                   |   43 +-
 security/apparmor/label.c                 | 1626 +++++++++++++++++++++++++++++
 security/apparmor/lib.c                   |   17 +
 security/apparmor/lsm.c                   |  576 +++++++++-
 security/apparmor/mount.c                 |  704 +++++++++++++
 security/apparmor/net.c                   |  169 +++
 security/apparmor/policy.c                |  788 ++++++++------
 security/apparmor/policy_unpack.c         |  184 +++-
 security/apparmor/procattr.c              |   51 +-
 security/apparmor/resource.c              |   84 +-
 34 files changed, 5588 insertions(+), 795 deletions(-)
 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/label.c
 create mode 100644 security/apparmor/mount.c
 create mode 100644 security/apparmor/net.c

Comments

Tim Gardner Aug. 4, 2013, 9:49 a.m.