pull request: AppArmor update and regression fix

[Kees Cook]

The following changes since commit 519974172e5b579203b5b053bca2cb00c4fc0fa6:
  Tim Gardner (1):
        UBUNTU: Add support in e1000e for a couple of ICH10 PCI IDs

are available in the git repository at:

  git://kernel.ubuntu.com/kees/ubuntu-intrepid.git master

Kees Cook (1):
      UBUNTU: SAUCE: AppArmor: update to upstream subversion r1302

 fs/dcache.c                    |    2 +-
 fs/inotify_user.c              |    2 +-
 fs/namei.c                     |   32 +++++++++++++----
 fs/namespace.c                 |    5 ++-
 fs/open.c                      |   15 +++++---
 fs/reiserfs/xattr.c            |    2 +-
 fs/utimes.c                    |    9 +++--
 fs/xattr.c                     |    6 +--
 include/linux/fs.h             |    5 +++
 include/linux/security.h       |   25 +++++++++++++-
 include/linux/xattr.h          |    4 +-
 security/Makefile              |    5 +--
 security/apparmor/apparmor.h   |    2 +-
 security/apparmor/apparmorfs.c |    4 +-
 security/apparmor/lsm.c        |   72 +++++++++++++++++++--------------------
 security/apparmor/main.c       |    3 +-
 security/capability.c          |   18 +++++++---
 security/security.c            |   11 +++++-
 security/selinux/hooks.c       |    2 +-
 security/smack/smack_lsm.c     |   14 +++++++-
 ubuntu/aufs/dir.c              |    1 +
 ubuntu/aufs/f_op.c             |    1 +
 ubuntu/aufs/i_op.c             |   25 ++++++++------
 ubuntu/aufs/inode.h            |    1 +
 ubuntu/aufs/misc.c             |    5 +--
 ubuntu/aufs/vfsub.c            |   17 +++++++---
 ubuntu/aufs/vfsub.h            |    2 +
 27 files changed, 187 insertions(+), 103 deletions(-)






-- 
Kees Cook
Ubuntu Security Team