[vivid] pull-request apparmor 3.18

This is a rebase of apparmor 3 RC1 that is in utopic onto 3.18

The config patch is just setting the default config values and
can be folded into the base patch if desired



The following changes since commit fca21b62442421d036362eadb41368a2bda24ad6:

  UBUNTU: Start new release (2014-12-09 06:21:22 -0800)

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-vivid.git apparmor

for you to fetch changes up to 080e088f15e62718ad50f11e2c35e348b122e82f:

  UBUNTU: [config] set apparmor config options (2014-12-10 23:44:12 -0800)

----------------------------------------------------------------
John Johansen (5):
      UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - RC1 snapshot
      UBUNTU: SAUCE: Revert: fix: only allow a single threaded process to ...
      UBUNTU: SAUCE: (no-up) fix: bad unix_addr_fs macro
      UBUNTU: SAUCE: (no-up) apparmor: add parameter to control whether policy hashing is used
      UBUNTU: [config] set apparmor config options

 debian.master/config/config.common.ubuntu |    3 +
 security/apparmor/.gitignore              |    1 +
 security/apparmor/Kconfig                 |   56 +-
 security/apparmor/Makefile                |   43 +-
 security/apparmor/af_unix.c               |  632 ++++++++++
 security/apparmor/apparmorfs.c            |  319 ++++-
 security/apparmor/audit.c                 |   75 +-
 security/apparmor/capability.c            |   52 +-
 security/apparmor/context.c               |   88 +-
 security/apparmor/domain.c                |  160 ++-
 security/apparmor/file.c                  |  555 ++++++---
 security/apparmor/include/af_unix.h       |  121 ++
 security/apparmor/include/apparmor.h      |   61 +-
 security/apparmor/include/apparmorfs.h    |    2 +
 security/apparmor/include/audit.h         |   72 +-
 security/apparmor/include/capability.h    |    6 +-
 security/apparmor/include/context.h       |  178 +--
 security/apparmor/include/domain.h        |    2 +
 security/apparmor/include/file.h          |   92 +-
 security/apparmor/include/ipc.h           |   22 +-
 security/apparmor/include/label.h         |  419 +++++++
 security/apparmor/include/match.h         |   15 +
 security/apparmor/include/mount.h         |   54 +
 security/apparmor/include/net.h           |  110 ++
 security/apparmor/include/path.h          |   63 +-
 security/apparmor/include/perms.h         |  174 +++
 security/apparmor/include/policy.h        |  173 +--
 security/apparmor/include/procattr.h      |    2 +-
 security/apparmor/include/resource.h      |    4 +-
 security/apparmor/include/sig_names.h     |   95 ++
 security/apparmor/ipc.c                   |  235 +++-
 security/apparmor/label.c                 | 1844 +++++++++++++++++++++++++++++
 security/apparmor/lib.c                   |  434 ++++++-
 security/apparmor/lsm.c                   |  819 +++++++++++--
 security/apparmor/mount.c                 |  703 +++++++++++
 security/apparmor/net.c                   |  397 +++++++
 security/apparmor/path.c                  |  175 ++-
 security/apparmor/policy.c                |  409 ++++---
 security/apparmor/policy_unpack.c         |  130 +-
 security/apparmor/procattr.c              |   60 +-
 security/apparmor/resource.c              |  112 +-
 41 files changed, 7846 insertions(+), 1121 deletions(-)
 create mode 100644 security/apparmor/af_unix.c
 create mode 100644 security/apparmor/include/af_unix.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/include/perms.h
 create mode 100644 security/apparmor/include/sig_names.h
 create mode 100644 security/apparmor/label.c
 create mode 100644 security/apparmor/mount.c
 create mode 100644 security/apparmor/net.c

Applied to Vivid.

Thanks for the turn-around on this one.

-apw