Message ID | 51CD2FD4.8060504@jjmx.net |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> 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 4C5202C037F for <incoming@patchwork.ozlabs.org>; Fri, 28 Jun 2013 19:23:09 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1UsUtM-0005jy-15; Fri, 28 Jun 2013 09:22:56 +0000 Received: from mail-pa0-f54.google.com ([209.85.220.54]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from <john@jjmx.net>) id 1UsSM6-0006WH-2A for kernel-team@lists.ubuntu.com; Fri, 28 Jun 2013 06:40:26 +0000 Received: by mail-pa0-f54.google.com with SMTP id kx10so2054774pab.13 for <kernel-team@lists.ubuntu.com>; Thu, 27 Jun 2013 23:40:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :x-enigmail-version:content-type:content-transfer-encoding :x-gm-message-state; bh=77Bcm5uIcdydmXsiLCb1PRYTJFtmqza12DuQflEYnF0=; b=TAo0U6iefT+qDj+nBgLYDWD9iCeBFSJ3kXr/WrUG2qIZEMcxqXC3eLi8aPlGoBxUDG Hgu4x81m7VFb73dSefkzVDE8v8Id727JPWLL5TflmttQNRK7JomSOQvYFVVAFXjsifhe FtAwxJchrYNCzKya9+Fze9itZu34cDkUxnvO3t4/O3W/iXy4xpvgo7FxBC12NNFZ33LZ QqdBm6QZnqZx9i1M41IJ//homflA434TyZFKhX9U8qGlxzj9G2Mk482vrawWpTQdXBa7 mNVS9IJS09rR+XiCzbz8xfCP3qfYRitjlWMHJ2vEZAtVoLY2H2qokisCEJ0boiQwhGDX 6KUg== X-Received: by 10.67.5.8 with SMTP id ci8mr9761209pad.48.1372401624940; Thu, 27 Jun 2013 23:40:24 -0700 (PDT) Received: from [192.168.192.110] (static-50-53-37-166.bvtn.or.frontiernet.net. [50.53.37.166]) by mx.google.com with ESMTPSA id v7sm6649148pbq.32.2013.06.27.23.40.22 for <kernel-team@lists.ubuntu.com> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Jun 2013 23:40:23 -0700 (PDT) Message-ID: <51CD2FD4.8060504@jjmx.net> Date: Thu, 27 Jun 2013 23:40:20 -0700 From: John Johansen <john@jjmx.net> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Kernel team list <kernel-team@lists.ubuntu.com> Subject: [saucy][Pull request] SAUCE: Sync to apparmor 3 dev stable snapshot X-Enigmail-Version: 1.4.6 X-Gm-Message-State: ALoCoQnI6/XvUlthwjnNMfwhAHkglBtXsYXZblQXWs4w6tRusH7j9H6oqrd/GDtMDBGkyNt0bYYP X-Mailman-Approved-At: Fri, 28 Jun 2013 09:22:54 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com |
This is a sync to the apparmor 3 development snapshot which is a squash of several commits in the apparmor development tree. Please see 8591e3d UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot for details of the patches in the squash Several of the patches in the squash have been submitted upstream. Several more will be submitted soon, and other parts are still in active review and development. This squash will be updated to remove patches as they are pulled into the upstream tree, and add new patches as they become available to the stable apparmor dev branch. Signed-off-by: John Johansen <john.johansen@canonical.com> --- The following changes since commit 0934325265cbd13995e6e0d6412334a2eeb21eeb: UBUNTU: Ubuntu-3.10.0-0.7 (2013-06-25 09:11:13 +0100) are available in the git repository at: git://kernel.ubuntu.com/jj/ubuntu-saucy/ saucy-apparmor3 for you to fetch changes up to 8591e3da7e4c9fb5e1ae64d1f8a8d7fe30e41dbd: UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot (2013-06-27 23:12:10 -0700) ---------------------------------------------------------------- John Johansen (7): Revert "UBUNTU: SAUCE: (no-up) apparmor: Fix quieting of audit messages for network mediation" Revert "UBUNTU: SAUCE: (no-up) apparmor: Fix compile warnings" Revert "UBUNTU: SAUCE: (no-up) AppArmor: basic networking rules" Revert "UBUNTU: SAUCE: (no-up) apparmor: Add the ability to mediate mount" Revert "UBUNTU: SAUCE: (no-up) AppArmor: Add profile introspection file to interface" Revert "UBUNTU: SAUCE: (no-up) AppArmor: Disable Add PR_{GET,SET}_NO_NEW_PRIVS to prevent execve from granting privs" UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor 3 dev stable snapshot debian.master/config/config.common.ubuntu | 2 + security/apparmor/Kconfig | 35 + security/apparmor/Makefile | 3 +- security/apparmor/apparmorfs.c | 574 +++++++++- security/apparmor/audit.c | 64 +- security/apparmor/capability.c | 8 +- security/apparmor/context.c | 122 +-- security/apparmor/domain.c | 125 +-- security/apparmor/file.c | 211 ++-- security/apparmor/include/apparmor.h | 55 +- security/apparmor/include/apparmorfs.h | 39 + security/apparmor/include/audit.h | 9 +- security/apparmor/include/context.h | 158 ++- security/apparmor/include/file.h | 23 +- security/apparmor/include/ipc.h | 4 +- security/apparmor/include/label.h | 325 ++++++ security/apparmor/include/match.h | 21 +- security/apparmor/include/mount.h | 16 +- security/apparmor/include/net.h | 12 +- security/apparmor/include/path.h | 2 +- security/apparmor/include/policy.h | 211 ++-- security/apparmor/include/policy_unpack.h | 21 +- security/apparmor/include/procattr.h | 3 +- security/apparmor/include/resource.h | 4 +- security/apparmor/include/sid.h | 4 +- security/apparmor/ipc.c | 52 +- security/apparmor/label.c | 1626 +++++++++++++++++++++++++++++ security/apparmor/lib.c | 39 +- security/apparmor/lsm.c | 526 ++++++++-- security/apparmor/match.c | 23 +- security/apparmor/mount.c | 362 ++++--- security/apparmor/net.c | 55 +- security/apparmor/path.c | 2 +- security/apparmor/policy.c | 874 ++++++++++------ security/apparmor/policy_unpack.c | 152 ++- security/apparmor/procattr.c | 57 +- security/apparmor/resource.c | 95 +- 37 files changed, 4670 insertions(+), 1244 deletions(-) create mode 100644 security/apparmor/include/label.h create mode 100644 security/apparmor/label.c