security/apparmor/Makefile          |   3 +-
 security/apparmor/af_unix.c         | 651 ++++++++++++++++++++++++++++++++++++
 security/apparmor/apparmorfs.c      |   6 +
 security/apparmor/file.c            |   4 +-
 security/apparmor/include/af_unix.h | 114 +++++++
 security/apparmor/include/net.h     |  16 +-
 security/apparmor/include/path.h    |   1 +
 security/apparmor/include/policy.h  |   2 +-
 security/apparmor/label.c           |   2 +-
 security/apparmor/lsm.c             | 169 ++++++----
 security/apparmor/net.c             | 174 +++++++++-
 11 files changed, 1073 insertions(+), 69 deletions(-)