Patchwork AppArmor update

login
register
mail settings
Submitter John Johansen
Date March 15, 2012, 11:28 p.m.
Message ID <4F627B39.6020509@canonical.com>
Download mbox
Permalink /patch/147109/
State New
Headers show

Pull-request

git://kernel.ubuntu.com/jj/ubuntu-precise.git apparmor

Comments

John Johansen - March 15, 2012, 11:28 p.m.
The following request pull updates AppArmor for the latest bug fixes and
updates due to upstream feed back.

It reverts 1 patch for a Bug Fix Bug #948147
      Revert "UBUNTU: SAUCE: AppArmor: Make chroot relative the default path lookup type"

It folds the 2 mount patches together into a single patch, and refreshes
them for bug fixes, and changes based on upstream feedback
      Revert "UBUNTU: SAUCE: AppArmor: Add mount information to apparmorfs"
      Revert "UBUNTU: SAUCE: AppArmor: Add the ability to mediate mount"

and it reorders the last 4 patches to match current upstreaming ordering.
As it stands the patches up to and including
  UBUNTU: SAUCE: AppArmor: Add profile introspection file to interface

Have been pulled into security-next and can be rebased away off of that
tree.  The last 3 patches have not made it upstream yet.  The mount patch
will be next



The following changes since commit e9c4a165e75b9a308a10e5e0ae0a5956a46d9a6a:

  UBUNTU: Ubuntu-3.2.0-18.29 (2012-03-09 07:57:47 -0800)

are available in the git repository at:

  git://kernel.ubuntu.com/jj/ubuntu-precise.git apparmor

for you to fetch changes up to ab07da1da1b76a186520dbcd57f02e97ed44ac2c:

  UBUNTU: SAUCE: AppArmor: basic networking rules (2012-03-15 16:15:34 -0700)

----------------------------------------------------------------
John Johansen (10):
      Revert "UBUNTU: SAUCE: AppArmor: Make chroot relative the default path lookup type"
      Revert "UBUNTU: SAUCE: AppArmor: Add mount information to apparmorfs"
      Revert "UBUNTU: SAUCE: AppArmor: Add the ability to mediate mount"
      Revert "UBUNTU: SAUCE: AppArmor: Add profile introspection file to interface"
      Revert "UBUNTU: SAUCE: AppArmor: basic networking rules"
      Revert "UBUNTU: SAUCE: AppArmor: Add ability to load extended policy"
      UBUNTU: SAUCE: 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

 security/apparmor/Makefile        |    2 +-
 security/apparmor/apparmorfs.c    |    2 +-
 security/apparmor/include/mount.h |    3 +-
 security/apparmor/mount.c         |  364 +++++++++++++++++++------------------
 security/apparmor/policy.c        |    3 -
 security/apparmor/policy_unpack.c |    3 +-
 6 files changed, 196 insertions(+), 181 deletions(-)
Tim Gardner - March 16, 2012, 3:03 a.m.
--
> John Johansen (10):
>        Revert "UBUNTU: SAUCE: AppArmor: Make chroot relative the default path lookup type"
>        Revert "UBUNTU: SAUCE: AppArmor: Add mount information to apparmorfs"
>        Revert "UBUNTU: SAUCE: AppArmor: Add the ability to mediate mount"
>        Revert "UBUNTU: SAUCE: AppArmor: Add profile introspection file to interface"
>        Revert "UBUNTU: SAUCE: AppArmor: basic networking rules"
>        Revert "UBUNTU: SAUCE: AppArmor: Add ability to load extended policy"
>        UBUNTU: SAUCE: 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
>

I dropped the 6 reverts and the original patches.