Pull Request: AppArmor for Intrepid

[Ben Collins]

On Mon, 2008-07-07 at 17:11 -0700, Kees Cook wrote:
> This includes a few patch-sets from current upstream linux-2.6 tree,
> needed to bring the VFS up to date with AppArmor's patches.
> 
> 
> The following changes since commit cc3d878136f3563502a8ccb99b45e43a6c6df8de:
>   Ben Collins (1):
>         UBUNTU: Ubuntu-2.6.26-3.9
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/kees/ubuntu-intrepid.git master

Thanks Kees. Going to need you to rebase this on latest git though
(moved to -rc9 this morning).

> Andreas Gruenbacher (1):
>       [patch 3/3] vfs: make d_path() consistent across mount operations
> 
> Denis V. Lunev (1):
>       [patch 4/4] flock: remove unused fields from file_lock_operations
> 
> Jan Blunck (1):
>       [patch 1/4] vfs: path_{get,put}() cleanups
> 
> Jan Engelhardt (1):
>       [patch 2/4] fs: make struct file arg to d_path const
> 
> Kees Cook (4):
>       UBUNTU: SAUCE: [AppArmor] merge with upstream subversion r1291
>       UBUNTU: Updating configs for AppArmor
>       UBUNTU: SAUCE: [AppArmor] fix typo in selinux_inode_link
>       UBUNTU: SAUCE: [AppArmor] aufs patches
> 
> Marcin Slusarz (1):
>       [patch 3/4] vfs: fix ERR_PTR abuse in generic_readlink
> 
> Miklos Szeredi (2):
>       [patch 1/3] vfs: dcache sparse fixes
>       [patch 2/3] vfs: dcache cleanups
> 
>  debian/config/amd64/config           |    3 +
>  debian/config/i386/config            |    3 +
>  fs/afs/dir.c                         |    1 +
>  fs/afs/file.c                        |    1 +
>  fs/afs/inode.c                       |   19 +-
>  fs/afs/internal.h                    |    1 +
>  fs/attr.c                            |   33 +-
>  fs/dcache.c                          |  180 ++--
>  fs/ecryptfs/inode.c                  |   41 +-
>  fs/exec.c                            |    3 +-
>  fs/fat/file.c                        |    2 +-
>  fs/fuse/dir.c                        |   20 +-
>  fs/fuse/file.c                       |    9 +-
>  fs/fuse/fuse_i.h                     |    4 +
>  fs/hpfs/namei.c                      |    2 +-
>  fs/locks.c                           |    6 -
>  fs/namei.c                           |  130 ++--
>  fs/namespace.c                       |   29 +
>  fs/nfsd/nfs4recover.c                |    7 +-
>  fs/nfsd/nfs4xdr.c                    |    2 +-
>  fs/nfsd/vfs.c                        |   93 ++-
>  fs/ntfs/file.c                       |    2 +-
>  fs/open.c                            |   45 +-
>  fs/pipe.c                            |   10 +-
>  fs/reiserfs/xattr.c                  |    8 +-
>  fs/seq_file.c                        |    4 +-
>  fs/splice.c                          |    4 +-
>  fs/stat.c                            |    2 +-
>  fs/sysfs/file.c                      |    2 +-
>  fs/utimes.c                          |   17 +-
>  fs/xattr.c                           |   81 +-
>  fs/xfs/linux-2.6/xfs_lrw.c           |    2 +-
>  include/linux/audit.h                |   12 +-
>  include/linux/dcache.h               |    7 +-
>  include/linux/fs.h                   |   30 +-
>  include/linux/mount.h                |    2 +
>  include/linux/nfsd/nfsd.h            |    3 +-
>  include/linux/security.h             |  182 +++--
>  include/linux/sysctl.h               |    2 +
>  include/linux/xattr.h                |    8 +-
>  ipc/mqueue.c                         |    2 +-
>  kernel/audit.c                       |    6 +-
>  kernel/cgroup.c                      |    2 +-
>  kernel/sysctl.c                      |   27 +
>  mm/filemap.c                         |   16 +-
>  mm/filemap_xip.c                     |    2 +-
>  mm/tiny-shmem.c                      |    2 +-
>  net/unix/af_unix.c                   |    3 +-
>  security/Kconfig                     |    1 +
>  security/Makefile                    |    1 +
>  security/apparmor/Kconfig            |   42 +
>  security/apparmor/Makefile           |   18 +
>  security/apparmor/apparmor.h         |  403 ++++++++
>  security/apparmor/apparmorfs.c       |  280 ++++++
>  security/apparmor/inline.h           |  250 +++++
>  security/apparmor/list.c             |  174 ++++
>  security/apparmor/locking.txt        |   68 ++
>  security/apparmor/lsm.c              | 1114 ++++++++++++++++++++++
>  security/apparmor/main.c             | 1689 ++++++++++++++++++++++++++++++++++
>  security/apparmor/match.c            |  364 ++++++++
>  security/apparmor/match.h            |   87 ++
>  security/apparmor/module_interface.c |  967 +++++++++++++++++++
>  security/apparmor/procattr.c         |  195 ++++
>  security/commoncap.c                 |    8 +-
>  security/dummy.c                     |   46 +-
>  security/security.c                  |   85 +-
>  security/selinux/hooks.c             |   98 +-
>  ubuntu/aufs/dir.c                    |    1 +
>  ubuntu/aufs/f_op.c                   |    1 +
>  ubuntu/aufs/i_op.c                   |   27 +-
>  ubuntu/aufs/inode.h                  |    1 +
>  ubuntu/aufs/misc.c                   |    5 +-
>  ubuntu/aufs/vfsub.c                  |   27 +-
>  ubuntu/aufs/vfsub.h                  |    2 +
>  74 files changed, 6499 insertions(+), 527 deletions(-)
>  create mode 100644 security/apparmor/Kconfig
>  create mode 100644 security/apparmor/Makefile
>  create mode 100644 security/apparmor/apparmor.h
>  create mode 100644 security/apparmor/apparmorfs.c
>  create mode 100644 security/apparmor/inline.h
>  create mode 100644 security/apparmor/list.c
>  create mode 100644 security/apparmor/locking.txt
>  create mode 100644 security/apparmor/lsm.c
>  create mode 100644 security/apparmor/main.c
>  create mode 100644 security/apparmor/match.c
>  create mode 100644 security/apparmor/match.h
>  create mode 100644 security/apparmor/module_interface.c
>  create mode 100644 security/apparmor/procattr.c
> 
> -- 
> Kees Cook
> Ubuntu Security Team
>