Patchwork [saucy,Pull,request] SAUCE: apparmor3 sync for the manta kernel

login
register
mail settings
Submitter John Johansen
Date June 25, 2013, 1:01 p.m.
Message ID <51C99493.8060700@canonical.com>
Download mbox
Permalink /patch/254140/
State New
Headers show

Pull-request

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

Comments

John Johansen - June 25, 2013, 1:01 p.m.
This is the backport of the apparmor3 module to the 3.4 based manta kernel



The following changes since commit 67167bc172a9c82277987e66cfddd1c6b90ba7e6:

  UBUNTU: do_tools=false when cross compiling (2013-06-20 11:26:11 -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 3d3e8a616d122b46b87c9070af900e982752bee6:

  UBUNTU SAUCE: apparmor: 3.4 backport of apparmor3 (2013-06-25 02:55:02 -0700)

----------------------------------------------------------------
John Johansen (1):
      UBUNTU SAUCE: apparmor: 3.4 backport of apparmor3

 debian.manta/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                 |   65 ++--
 security/apparmor/capability.c            |   10 +-
 security/apparmor/context.c               |  122 +++---
 security/apparmor/domain.c                |  164 +++++----
 security/apparmor/file.c                  |  227 +++++++-----
 security/apparmor/include/apparmor.h      |   59 ++-
 security/apparmor/include/apparmorfs.h    |   39 ++
 security/apparmor/include/audit.h         |   31 +-
 security/apparmor/include/backport.h      |   62 ++++
 security/apparmor/include/context.h       |  158 +++++---
 security/apparmor/include/domain.h        |    2 +
 security/apparmor/include/file.h          |   27 +-
 security/apparmor/include/ipc.h           |    4 +-
 security/apparmor/include/label.h         |  325 ++++++++++++++++
 security/apparmor/include/match.h         |   21 +-
 security/apparmor/include/mount.h         |   54 +++
 security/apparmor/include/net.h           |   54 +++
 security/apparmor/include/path.h          |    2 +-
 security/apparmor/include/policy.h        |  214 ++++++-----
 security/apparmor/include/policy_unpack.h |   21 +-
 security/apparmor/include/procattr.h      |    3 +-
 security/apparmor/include/resource.h      |    4 +-
 security/apparmor/include/sid.h           |    4 +-
 security/apparmor/ipc.c                   |   54 +--
 security/apparmor/label.c                 | 1572 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 security/apparmor/lib.c                   |   41 ++-
 security/apparmor/lsm.c                   |  659 ++++++++++++++++++++++++++++-----
 security/apparmor/match.c                 |   23 +-
 security/apparmor/mount.c                 |  704 +++++++++++++++++++++++++++++++++++
 security/apparmor/net.c                   |  169 +++++++++
 security/apparmor/path.c                  |    4 +-
 security/apparmor/policy.c                |  855 ++++++++++++++++++++++++++----------------
 security/apparmor/policy_unpack.c         |  200 +++++++---
 security/apparmor/procattr.c              |   57 +--
 security/apparmor/resource.c              |   97 +++--
 40 files changed, 5927 insertions(+), 1017 deletions(-)
 create mode 100644 security/apparmor/include/backport.h
 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
Andy Whitcroft - June 25, 2013, 2:55 p.m.
Applied to Saucy.

-apw