[Maverick][pull-request] Updated AppArmor patchset

John Johansen john.johansen at canonical.com
Thu Jun 24 16:00:25 UTC 2010


This is a sync of the latest AppArmor patches

It is done as a rebase dropping the previous AppArmor commits
fbc0f9759ae773b4cd41f61e0a8adc52bda13b3b
acfe28126c3e9bd37c64d8a24a4df1d22cf5d2fc
9f4d674ba0de3b40663ea4b7a8c307ba6e05abee
652d3f2581fe3e94d2f5a141fabccc9cb53a8fdf
83b9af9a21b2adf148fada269293ac1e34ac2b2b
8b06cd508e740f91d7ab13d67582de0fc98a9ee5
2387cdb71c4a95d455947e7c33c725ad3fa749e8
1e293be54573280bb94e136729532e5c191a73ea
08ae33b80da0e340561783d7b22b43506936c282
bf4fc980354548a1f5dd35c7babb3cb85b2e8d94
a4ca3b9b8fed2929bd7b9334a5a1376234269f50
eb8204ea8161e609606de51eae547cda68b3b961
fd85e16a3de49437c148ab5306918258513796c7
6a00d866cb55db6829d6df666675277a5160b7fb
4230f0df8599961a3f191f98dd723b24664189e4
c73867ddd2d5d1be3df6647fa16f42115b25f879
45eca64635739462f6330aa66139716aec8db6bb
d57880f2aa303c48fa874eb7aab9214b17cf0b71
34a3b76f4a632b64754f9501e12ce227aab1ee70
c34dad64bcda7df64923e3e152e1120bb67cde88
8295fbc5ded3fcc460652c3243f72504a1f492a0

and modifying
commit 069cb89e17c6dc5b2a1de2469746bc42935850fb
Author: Kees Cook <kees at ubuntu.com>
Date:   Wed May 12 09:03:08 2010 -0700

    UBUNTU: SAUCE: fs: block hardlinks to non-accessible sources

to split the AppArmor portion into a new patch on top of the
updated AppArmor patchset

The following changes since commit 42badb6629b859c9b2e081f44eb53a4905341015:
  Mathieu J. Poirier (1):
        UBUNTU: [Config] ARM: Turning off CONFIG_CPU_IDLE on omap

are available in the git repository at:

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

John Johansen (3):
      UBUNTU: SAUCE: AppArmor: -- mainline 2010-06-23
      UBUNTU: SAUCE: AppArmor 2.4 compatibility patch
      UBUNTU: SAUCE: fs: block hardlinks to non-accessible sources AppArmor portion

 include/linux/lsm_audit.h                 |   33 +-
 security/Kconfig                          |    6 +
 security/Makefile                         |    2 +
 security/apparmor/.gitignore              |    5 +
 security/apparmor/Kconfig                 |   40 +
 security/apparmor/Makefile                |   30 +
 security/apparmor/apparmorfs-24.c         |  287 +++++++
 security/apparmor/apparmorfs.c            |  298 ++++++++
 security/apparmor/audit.c                 |  206 +++++
 security/apparmor/capability.c            |  141 ++++
 security/apparmor/context.c               |  216 ++++++
 security/apparmor/domain.c                |  819 ++++++++++++++++++++
 security/apparmor/file.c                  |  484 ++++++++++++
 security/apparmor/include/apparmor.h      |   82 ++
 security/apparmor/include/apparmorfs.h    |   29 +
 security/apparmor/include/audit.h         |  127 ++++
 security/apparmor/include/capability.h    |   45 ++
 security/apparmor/include/context.h       |  154 ++++
 security/apparmor/include/domain.h        |   36 +
 security/apparmor/include/file.h          |  224 ++++++
 security/apparmor/include/ipc.h           |   28 +
 security/apparmor/include/match.h         |  139 ++++
 security/apparmor/include/net.h           |   40 +
 security/apparmor/include/path.h          |   32 +
 security/apparmor/include/policy.h        |  314 ++++++++
 security/apparmor/include/policy_unpack.h |   20 +
 security/apparmor/include/procattr.h      |   26 +
 security/apparmor/include/resource.h      |   46 ++
 security/apparmor/include/sid.h           |   24 +
 security/apparmor/ipc.c                   |  114 +++
 security/apparmor/lib.c                   |   84 ++
 security/apparmor/lsm.c                   | 1083 ++++++++++++++++++++++++++
 security/apparmor/match.c                 |  387 ++++++++++
 security/apparmor/net.c                   |  167 ++++
 security/apparmor/path.c                  |  243 ++++++
 security/apparmor/policy.c                | 1177 +++++++++++++++++++++++++++++
 security/apparmor/policy_unpack.c         |  731 ++++++++++++++++++
 security/apparmor/procattr.c              |  167 ++++
 security/apparmor/resource.c              |  132 ++++
 security/apparmor/sid.c                   |   55 ++
 40 files changed, 8272 insertions(+), 1 deletions(-)
 create mode 100644 security/apparmor/.gitignore
 create mode 100644 security/apparmor/Kconfig
 create mode 100644 security/apparmor/Makefile
 create mode 100644 security/apparmor/apparmorfs-24.c
 create mode 100644 security/apparmor/apparmorfs.c
 create mode 100644 security/apparmor/audit.c
 create mode 100644 security/apparmor/capability.c
 create mode 100644 security/apparmor/context.c
 create mode 100644 security/apparmor/domain.c
 create mode 100644 security/apparmor/file.c
 create mode 100644 security/apparmor/include/apparmor.h
 create mode 100644 security/apparmor/include/apparmorfs.h
 create mode 100644 security/apparmor/include/audit.h
 create mode 100644 security/apparmor/include/capability.h
 create mode 100644 security/apparmor/include/context.h
 create mode 100644 security/apparmor/include/domain.h
 create mode 100644 security/apparmor/include/file.h
 create mode 100644 security/apparmor/include/ipc.h
 create mode 100644 security/apparmor/include/match.h
 create mode 100644 security/apparmor/include/net.h
 create mode 100644 security/apparmor/include/path.h
 create mode 100644 security/apparmor/include/policy.h
 create mode 100644 security/apparmor/include/policy_unpack.h
 create mode 100644 security/apparmor/include/procattr.h
 create mode 100644 security/apparmor/include/resource.h
 create mode 100644 security/apparmor/include/sid.h
 create mode 100644 security/apparmor/ipc.c
 create mode 100644 security/apparmor/lib.c
 create mode 100644 security/apparmor/lsm.c
 create mode 100644 security/apparmor/match.c
 create mode 100644 security/apparmor/net.c
 create mode 100644 security/apparmor/path.c
 create mode 100644 security/apparmor/policy.c
 create mode 100644 security/apparmor/policy_unpack.c
 create mode 100644 security/apparmor/procattr.c
 create mode 100644 security/apparmor/resource.c
 create mode 100644 security/apparmor/sid.c




More information about the kernel-team mailing list