[Maverick][PATCH][pull request] sync to AppArmor mainline 2010-07-29

[John Johansen]

This is a pull-request to sync apparmor with the mainline version
In doing this tree I did a rebase popping off the 2 compatibility
patches.  And applied commit
c6e856d05c1222a608c348d7c14c412e74c96fa5
immediately after the previous sync of 2010-07-27
c4fa4d12e4f8cbbd142e617214244b6f9c59baf0

and then pushed the 2 compatibility patches back on top.  This keeps
the base clean (matching what is upstream) without having to fixup the
compatibility patches that are on top.

The attached patch is the sync commit c6e856 that I slipped in, so the
sync can be pulled from the tree or patch.

----

The following changes since commit c4fa4d12e4f8cbbd142e617214244b6f9c59baf0:
  John Johansen (1):
        UBUNTU: SAUCE: AppArmor: -- sync to AppArmor mainline 2010-07-27

are available in the git repository at:

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

John Johansen (3):
      UBUNTU: SAUCE: AppArmor: -- sync to AppArmor mainline 2010-07-29
      UBUNTU: SAUCE: AppArmor 2.4 compatibility patch
      UBUNTU: SAUCE: AppArmor: Allow dfa backward compatibility with broken userspace

 Documentation/apparmor.txt             |   40 +++++++++++
 Documentation/kernel-parameters.txt    |    8 ++
 MAINTAINERS                            |    8 ++
 include/linux/lsm_audit.h              |    4 +
 security/apparmor/Kconfig              |   15 ++++-
 security/apparmor/Makefile             |    8 ++-
 security/apparmor/apparmorfs-24.c      |    2 +-
 security/apparmor/apparmorfs.c         |   30 ++++++--
 security/apparmor/audit.c              |    4 +-
 security/apparmor/capability.c         |    2 +-
 security/apparmor/context.c            |    2 +-
 security/apparmor/domain.c             |   22 ++++---
 security/apparmor/file.c               |    2 +-
 security/apparmor/include/apparmor.h   |    9 +--
 security/apparmor/include/apparmorfs.h |    8 ++-
 security/apparmor/include/file.h       |    6 +-
 security/apparmor/include/match.h      |    2 +-
 security/apparmor/include/policy.h     |   35 +++++-----
 security/apparmor/include/procattr.h   |    2 +-
 security/apparmor/include/resource.h   |    4 +-
 security/apparmor/lib.c                |   11 ++-
 security/apparmor/lsm.c                |  114 +++++++++++++++++++++++++++++++-
 security/apparmor/match.c              |   21 +++++-
 security/apparmor/net.c                |    8 ++-
 security/apparmor/path.c               |    6 +-
 security/apparmor/policy.c             |   25 ++++----
 security/apparmor/policy_unpack.c      |   56 ++++++++++++++--
 security/apparmor/procattr.c           |    6 +-
 security/apparmor/resource.c           |    2 +-
 29 files changed, 370 insertions(+), 92 deletions(-)
 create mode 100644 Documentation/apparmor.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-UBUNTU-SAUCE-AppArmor-sync-to-AppArmor-mainline-2010.patch
Type: text/x-diff
Size: 34868 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20100730/17f6564d/attachment.patch>