[xenial SRU] sync of apparmor 3.6 released in Ubuntu 16.10 to support snaps on Xenial

[John Johansen]

This pull request is an SRU sync of apparmor 3.6 released in Ubuntu 16.10 in support of

BugLink: http://bugs.launchpad.net/bugs/1611078

it includes Andy Whitcroft's fix

  UBUNTU: SAUCE: (no-up) include/linux/secuirty.h -- fix syntax error with CONFIG_SECURITYFS=n

it is a squash of

  git request-pull 162e766089a4fdbbb6626f39cc23da92fdb2204e git://kernel.ubuntu.com/jj/ubuntu-xenial.git xenial-SRU-of-yakkety-presquash

which contains Andy's patch broken out as well as the set of patches done for the sync and backport to the 4.4 kernel. If desired the -presquash branch can be taken instead however the series of patches is none bisectable due to the backports being done as a synch and then an individual patch for each change needed to pull that sync back to the 4.4 kernel.


Note: these are against xenial/master-next. If applied to an earlier kernel then a slightly different version of the backport is needed due to cfe3f4205d1fdaff462ec5f8bcb0b357124b17f5 which needs to be accounted for in the backport


---

The following changes since commit 162e766089a4fdbbb6626f39cc23da92fdb2204e:

  Linux 4.4.24 (2016-10-07 12:44:46 -0600)

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-xenial.git xenial-SRU-of-yakkety

for you to fetch changes up to 04de43e94925214d8786440224ee7f03758b25ce:

  UBUNTU: SAUCE: (no-up) apparmor: sync of apparmor 3.6 (from Ubuntu 16.10) (2016-10-07 14:19:20 -0700)

----------------------------------------------------------------
John Johansen (1):
      UBUNTU: SAUCE: (no-up) apparmor: sync of apparmor 3.6 (from Ubuntu 16.10)

 include/linux/security.h                  |  33 +-
 security/apparmor/Kconfig                 |   2 +-
 security/apparmor/Makefile                |   2 +-
 security/apparmor/apparmorfs.c            | 629 +++++++++++++++++++++++++++---
 security/apparmor/backport.c              |  19 +
 security/apparmor/crypto.c                |  40 ++
 security/apparmor/domain.c                | 116 +++---
 security/apparmor/file.c                  | 131 +++----
 security/apparmor/include/apparmor.h      |   2 +
 security/apparmor/include/apparmorfs.h    |  14 +-
 security/apparmor/include/backport.h      |  20 +
 security/apparmor/include/crypto.h        |   5 +
 security/apparmor/include/file.h          |  13 +-
 security/apparmor/include/mount.h         |  16 +-
 security/apparmor/include/path.h          |   2 +-
 security/apparmor/include/perms.h         |  26 +-
 security/apparmor/include/policy.h        |  31 +-
 security/apparmor/include/policy_ns.h     |  23 ++
 security/apparmor/include/policy_unpack.h |  27 +-
 security/apparmor/label.c                 |  17 +-
 security/apparmor/lsm.c                   | 246 +++++++-----
 security/apparmor/match.c                 |   4 +-
 security/apparmor/mount.c                 | 369 ++++++++----------
 security/apparmor/path.c                  |  12 +-
 security/apparmor/policy.c                | 124 ++++--
 security/apparmor/policy_ns.c             | 110 ++++--
 security/apparmor/policy_unpack.c         |  96 ++++-
 security/inode.c                          | 103 +++--
 28 files changed, 1604 insertions(+), 628 deletions(-)
 create mode 100644 security/apparmor/backport.c
 create mode 100644 security/apparmor/include/backport.h