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

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

Pull-request

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

Comments

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



The following changes since commit d70e765b18c07b62083369dc610e51ed4f6517f9:

  UBUNTU: do_tools=false when cross compiling (2013-06-20 10:54:36 -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 c2952fb1c8ba681238b414327e33ee6d9858d3d9:

  UBUNTU: SAUCE: apparmor: 3.1 backport of apparmor3 (2013-06-25 02:57:03 -0700)

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

 debian.grouper/config/config.common.ubuntu |    3 +-
 include/linux/lsm_audit.h                  |    4 -
 security/apparmor/.gitignore               |    1 -
 security/apparmor/Kconfig                  |   36 +-
 security/apparmor/Makefile                 |   85 +++--
 security/apparmor/apparmorfs-24.c          |  287 --------------
 security/apparmor/apparmorfs.c             |  942 +++++++++++++++++++++++++++++++++++++++++++---
 security/apparmor/audit.c                  |   74 ++--
 security/apparmor/capability.c             |   10 +-
 security/apparmor/context.c                |  122 +++---
 security/apparmor/domain.c                 |  168 +++++----
 security/apparmor/file.c                   |  264 +++++++------
 security/apparmor/include/apparmor.h       |   82 +++-
 security/apparmor/include/apparmorfs.h     |   87 ++++-
 security/apparmor/include/audit.h          |   65 +++-
 security/apparmor/include/backport.h       |   62 +++
 security/apparmor/include/context.h        |  158 +++++---
 security/apparmor/include/domain.h         |    2 +
 security/apparmor/include/file.h           |   29 +-
 security/apparmor/include/ipc.h            |    4 +-
 security/apparmor/include/label.h          |  325 ++++++++++++++++
 security/apparmor/include/match.h          |   24 +-
 security/apparmor/include/mount.h          |   54 +++
 security/apparmor/include/net.h            |   18 +-
 security/apparmor/include/path.h           |    5 +-
 security/apparmor/include/policy.h         |  224 ++++++-----
 security/apparmor/include/policy_unpack.h  |   21 +-
 security/apparmor/include/procattr.h       |    3 +-
 security/apparmor/include/resource.h       |    8 +-
 security/apparmor/include/sid.h            |    4 +-
 security/apparmor/ipc.c                    |   61 +--
 security/apparmor/label.c                  | 1572 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 security/apparmor/lib.c                    |   44 ++-
 security/apparmor/lsm.c                    |  576 ++++++++++++++++++++++------
 security/apparmor/match.c                  |  112 ++++--
 security/apparmor/mount.c                  |  704 +++++++++++++++++++++++++++++++++++
 security/apparmor/net.c                    |   85 ++---
 security/apparmor/path.c                   |   59 +--
 security/apparmor/policy.c                 |  865 ++++++++++++++++++++++++++----------------
 security/apparmor/policy_unpack.c          |  211 ++++++++---
 security/apparmor/procattr.c               |   58 +--
 security/apparmor/resource.c               |  108 ++++--
 42 files changed, 6084 insertions(+), 1542 deletions(-)
 delete mode 100644 security/apparmor/apparmorfs-24.c
 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/label.c
 create mode 100644 security/apparmor/mount.c
Tim Gardner - June 25, 2013, 3:06 p.m.