| Submitter | John Johansen |
|---|---|
| Date | March 22, 2012, 5:20 p.m. |
| Message ID | <4F6B5F65.4020301@canonical.com> |
| Download | mbox |
| Permalink | /patch/148279/ |
| State | New |
| Headers | show |
Pull-request
git://kernel.ubuntu.com/jj/ubuntu-precise.git apparmorComments
Ripped out the reverts as promised. I also stripped 'UBUNTU: [Upstream]' from all of the patches that were clean cherry picks.
The following changes since commit 42a0402fea89c497061901f4a75a78b69ce20c2f: UBUNTU: Ubuntu-3.2.0-20.32 (2012-03-21 16:11:56 -0700) are available in the git repository at: git://kernel.ubuntu.com/jj/ubuntu-precise.git apparmor for you to fetch changes up to 72abcec58e72951531d8d8ba8d478fc7db14d2b9: UBUNTU: SAUCE: Update aufs for build failure caused by apparmor backport (2012-03-22 10:13:52 -0700) ---------------------------------------------------------------- Al Viro (6): UBUNTU: [Upstream] btrfs, nfs, apparmor: don't pull mnt_namespace.h for no reason... UBUNTU: [Upstream] switch security_path_chmod() to umode_t UBUNTU: [Upstream] switch securityfs_create_file() to umode_t UBUNTU: [Upstream] switch ->path_mkdir() to umode_t UBUNTU: [Upstream] switch ->path_mknod() to umode_t UBUNTU: [Upstream] switch security_path_chmod() to struct path * Eric Paris (1): UBUNTU: [Upstream] capabilities: remove the task from capable LSM hook entirely Jan Engelhardt (1): UBUNTU: [Upstream] AppArmor: add const qualifiers to string arrays John Johansen (34): Revert "UBUNTU: SAUCE: AppArmor: basic networking rules" Revert "UBUNTU: SAUCE: AppArmor: Add profile introspection file to interface" Revert "UBUNTU: SAUCE: AppArmor: Add the ability to mediate mount" Revert "UBUNTU: SAUCE: AppArmor: Add ability to load extended policy" Revert "UBUNTU: SAUCE: AppArmor: Move path failure information into aa_get_name and rename" Revert "UBUNTU: SAUCE: AppArmor: Update dfa matching routines." Revert "UBUNTU: SAUCE: AppArmor: Minor cleanup of d_namespace_path to consolidate error handling" Revert "UBUNTU: SAUCE: AppArmor: Retrieve the dentry_path for error reporting when path lookup fails" Revert "UBUNTU: SAUCE: AppArmor: Fix the error case for chroot relative path name lookup" Revert "UBUNTU: SAUCE: AppArmor: fix mapping of META_READ to audit and quiet flags" Revert "UBUNTU: SAUCE: AppArmor: Fix underflow in xindex calculation" Revert "UBUNTU: SAUCE: AppArmor: Fix dropping of allowed operations that are force audited" Revert "UBUNTU: SAUCE: AppArmor: Add mising end of structure test to caps unpacking" Revert "UBUNTU: SAUCE: AppArmor: export known rlimit names/value mappings in securityfs" Revert "UBUNTU: SAUCE: AppArmor: add "file" details to securityfs" Revert "UBUNTU: SAUCE: AppArmor: add initial "features" directory to securityfs" Revert "UBUNTU: SAUCE: AppArmor: refactor securityfs to use structures" UBUNTU: [Upstream] AppArmor: Add mising end of structure test to caps unpacking UBUNTU: [Upstream] AppArmor: Fix dropping of allowed operations that are force audited UBUNTU: [Upstream] AppArmor: Fix underflow in xindex calculation UBUNTU: [Upstream] AppArmor: fix mapping of META_READ to audit and quiet flags UBUNTU: [Upstream] AppArmor: Fix the error case for chroot relative path name lookup UBUNTU: [Upstream] AppArmor: Fix error returned when a path lookup is disconnected UBUNTU: [Upstream] AppArmor: Fix oops in policy unpack auditing UBUNTU: [Upstream] AppArmor: Add const qualifiers to generated string tables UBUNTU: [Upstream] AppArmor: Retrieve the dentry_path for error reporting when path lookup fails UBUNTU: [Upstream] AppArmor: Minor cleanup of d_namespace_path to consolidate error handling UBUNTU: [Upstream] AppArmor: Update dfa matching routines. UBUNTU: [Upstream] AppArmor: Move path failure information into aa_get_name and rename UBUNTU: [Upstream] AppArmor: Add ability to load extended policy UBUNTU: SAUCE: AppArmor: Add the ability to mediate mount UBUNTU: SAUCE: AppArmor: Add profile introspection file to interface UBUNTU: SAUCE: AppArmor: basic networking rules UBUNTU: SAUCE: Update aufs for build failure caused by apparmor backport Kees Cook (5): UBUNTU: [Upstream] apparmor: add missing rcu_dereference() UBUNTU: [Upstream] AppArmor: refactor securityfs to use structures UBUNTU: [Upstream] AppArmor: add initial "features" directory to securityfs UBUNTU: [Upstream] AppArmor: add "file" details to securityfs UBUNTU: [Upstream] AppArmor: export known rlimit names/value mappings in securityfs Rusty Russell (1): UBUNTU: [Upstream] apparmor: fix module parameter handling Tetsuo Handa (1): UBUNTU: [Upstream] AppArmor: Fix location of const qualifier on generated string tables fs/btrfs/super.c | 1 - fs/nfs/super.c | 1 - fs/open.c | 2 +- include/linux/security.h | 42 +++++++++++++++-------------------- net/unix/af_unix.c | 2 +- security/apparmor/Makefile | 5 ++- security/apparmor/audit.c | 8 +++--- security/apparmor/include/audit.h | 4 +- security/apparmor/include/policy.h | 2 +- security/apparmor/lsm.c | 25 ++++++++++----------- security/apparmor/path.c | 3 +- security/apparmor/policy.c | 2 +- security/apparmor/policy_unpack.c | 5 ++- security/capability.c | 7 ++--- security/commoncap.c | 16 ++++++------- security/inode.c | 12 +++++----- security/security.c | 18 ++++++-------- security/selinux/hooks.c | 23 ++++++++----------- security/tomoyo/securityfs_if.c | 2 +- security/tomoyo/tomoyo.c | 15 +++++------- ubuntu/aufs/i_op.c | 3 +- 21 files changed, 89 insertions(+), 109 deletions(-)