From patchwork Fri Aug 16 17:51:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 267727 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 2A3D12C0290 for ; Sat, 17 Aug 2013 03:51:36 +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 1VAOBF-0000NK-Tw; Fri, 16 Aug 2013 17:51:21 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VAOB4-0000Jx-2e for kernel-team@lists.ubuntu.com; Fri, 16 Aug 2013 17:51:10 +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 1VAOB3-0007pw-Sa for kernel-team@lists.ubuntu.com; Fri, 16 Aug 2013 17:51:10 +0000 Message-ID: <520E668A.30207@canonical.com> Date: Fri, 16 Aug 2013 10:51:06 -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] 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 7a301801d1ebd09faa5b1a3d671dc4316220086f: UBUNTU: Ubuntu-3.11.0-2.5 (2013-08-12 09:46:40 -0600) are available in the git repository at: git://kernel.ubuntu.com/jj/ubuntu-saucy.git aa3.0 for you to fetch changes up to 3eb223f3ad4d8dba5d0c22b470a10edaf4e72b7f: UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot (2013-08-14 20:37:33 -0700) ---------------------------------------------------------------- John Johansen (3): Revert "UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot" Revert "UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users" UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 - alpha 4 snapshot debian.master/config/config.common.ubuntu | 1 + security/apparmor/Kconfig | 12 + security/apparmor/Makefile | 31 +- security/apparmor/apparmorfs.c | 55 ++- security/apparmor/audit.c | 44 +-- security/apparmor/capability.c | 13 +- security/apparmor/crypto.c | 97 +++++ security/apparmor/domain.c | 2 +- security/apparmor/file.c | 38 +- security/apparmor/include/apparmorfs.h | 1 + security/apparmor/include/audit.h | 3 +- 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/ipc.c | 4 +- security/apparmor/label.c | 597 ++++-------------------------- security/apparmor/lib.c | 7 +- security/apparmor/lsm.c | 28 +- security/apparmor/mount.c | 40 +- security/apparmor/net.c | 26 +- security/apparmor/policy.c | 36 +- security/apparmor/policy_unpack.c | 48 ++- security/apparmor/resource.c | 4 +- 25 files changed, 439 insertions(+), 713 deletions(-) create mode 100644 security/apparmor/crypto.c create mode 100644 security/apparmor/include/crypto.h