mbox

[trusty,pull] : apparmor 3.0 alpha 4

Message ID 527A8C5A.2000003@canonical.com
State New
Headers show

Pull-request

git://kernel.ubuntu.com/jj/ubuntu-trusty.git aa3.0-alpha4

Message

John Johansen Nov. 6, 2013, 6:37 p.m. UTC
This pull request syncs the trusty kernel to the version of apparmor in
13.10 (saucy).


The following changes since commit 7206b3a3550e372efa130c64d6d2381e5c3d845e:

  UBUNTU: Ubuntu-3.12.0-1.3 (2013-10-29 10:11:33 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-trusty.git aa3.0-alpha4

for you to fetch changes up to 070d88dd7748a4cc62288b964651baa08a0b8cd1:

  UBUNTU: SAUCE: apparmor: allocate path lookup buffers during init (2013-11-05 01:47:47 -0800)

----------------------------------------------------------------
John Johansen (3):
      UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot
      UBUNTU: SAUCE: apparmor: fix unix domain sockets to be mediated on connection
      UBUNTU: SAUCE: apparmor: allocate path lookup buffers during init

 security/apparmor/.gitignore         |    1 +
 security/apparmor/Kconfig            |   35 +
 security/apparmor/Makefile           |   40 +-
 security/apparmor/apparmorfs.c       |  186 +++++-
 security/apparmor/audit.c            |   66 +-
 security/apparmor/capability.c       |    8 +-
 security/apparmor/context.c          |   88 ++-
 security/apparmor/domain.c           |  102 +--
 security/apparmor/file.c             |  222 ++++---
 security/apparmor/include/apparmor.h |   42 +-
 security/apparmor/include/audit.h    |   23 +-
 security/apparmor/include/context.h  |  118 ++--
 security/apparmor/include/domain.h   |    2 +
 security/apparmor/include/file.h     |    9 +-
 security/apparmor/include/ipc.h      |    4 +-
 security/apparmor/include/label.h    |  312 +++++++++
 security/apparmor/include/mount.h    |   54 ++
 security/apparmor/include/net.h      |   54 ++
 security/apparmor/include/path.h     |   62 +-
 security/apparmor/include/policy.h   |  122 ++--
 security/apparmor/include/procattr.h |    2 +-
 security/apparmor/include/resource.h |    4 +-
 security/apparmor/ipc.c              |   47 +-
 security/apparmor/label.c            | 1161 ++++++++++++++++++++++++++++++++++
 security/apparmor/lib.c              |   19 +-
 security/apparmor/lsm.c              |  638 +++++++++++++++++--
 security/apparmor/mount.c            |  707 +++++++++++++++++++++
 security/apparmor/net.c              |  169 +++++
 security/apparmor/path.c             |   84 +--
 security/apparmor/policy.c           |  343 ++++++----
 security/apparmor/policy_unpack.c    |   67 +-
 security/apparmor/procattr.c         |   51 +-
 security/apparmor/resource.c         |   88 ++-
 33 files changed, 4225 insertions(+), 705 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

Andy Whitcroft Nov. 6, 2013, 6:38 p.m. UTC | #1
I'll handle this.

Thanks JJ.

-apw