From patchwork Fri Aug 16 17:51:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 267730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id CF3A02C00D9 for ; Sat, 17 Aug 2013 03:52:10 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VAOBw-0000Zx-4W; Fri, 16 Aug 2013 17:52:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VAOBO-0000Qd-QT for kernel-team@lists.ubuntu.com; Fri, 16 Aug 2013 17:51:30 +0000 Received: from static-50-53-37-166.bvtn.or.frontiernet.net ([50.53.37.166] helo=[192.168.192.110]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1VAOBO-0007qH-C7 for kernel-team@lists.ubuntu.com; Fri, 16 Aug 2013 17:51:30 +0000 Message-ID: <520E669F.60306@canonical.com> Date: Fri, 16 Aug 2013 10:51:27 -0700 From: John Johansen Organization: Canonical User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Kernel team list Subject: [PULL][saucy][grouper] apparmor 3 alpha4 sync X-Enigmail-Version: 1.4.6 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com The following changes since commit e3a0d1a63c2718d74633e9cb39532bfd2d1f699a: UBUNTU: Ubuntu-grouper-3.1.10-6.22 (2013-08-08 08:36:48 -0600) are available in the git repository at: git://kernel.ubuntu.com/jj/ubuntu-saucy.git grouper-apparmor3 for you to fetch changes up to 06cf4dfb8cb613f2a9941b8c0662ba22e4a57c22: UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot (2013-08-15 12:28:19 -0700) ---------------------------------------------------------------- John Johansen (3): Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users" Revert "UBUNTU: SAUCE: apparmor: 3.1 backport of apparmor3" UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot debian.grouper/config/config.common.ubuntu | 1 + include/linux/lsm_audit.h | 4 + security/apparmor/.gitignore | 1 + security/apparmor/Kconfig | 12 + security/apparmor/Makefile | 31 +- security/apparmor/apparmorfs-24.c | 287 +++++++++++++++ security/apparmor/apparmorfs.c | 55 ++- security/apparmor/capability.c | 5 + security/apparmor/crypto.c | 97 +++++ security/apparmor/domain.c | 2 +- security/apparmor/include/apparmorfs.h | 1 + security/apparmor/include/audit.h | 1 - security/apparmor/include/capability.h | 4 + security/apparmor/include/crypto.h | 36 ++ security/apparmor/include/file.h | 4 +- security/apparmor/include/label.h | 17 +- security/apparmor/include/policy.h | 4 +- security/apparmor/label.c | 569 ++++------------------------- security/apparmor/lib.c | 5 - security/apparmor/lsm.c | 24 +- security/apparmor/policy.c | 34 +- security/apparmor/policy_unpack.c | 38 +- 22 files changed, 651 insertions(+), 581 deletions(-) create mode 100644 security/apparmor/apparmorfs-24.c create mode 100644 security/apparmor/crypto.c create mode 100644 security/apparmor/include/crypto.h