From patchwork Thu Aug 11 05:02:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 109520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E1D5DB70C0 for ; Thu, 11 Aug 2011 15:03:19 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QrNQ5-0004PS-8W; Thu, 11 Aug 2011 05:03:01 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QrNQ3-0004P8-Co for kernel-team@lists.ubuntu.com; Thu, 11 Aug 2011 05:02:59 +0000 Received: from [12.234.128.131] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1QrNQ3-0000Vb-4D for kernel-team@lists.ubuntu.com; Thu, 11 Aug 2011 05:02:59 +0000 From: John Johansen To: kernel-team@lists.ubuntu.com Subject: [PATCH 01/13] Revert "UBUNTU: SAUCE: AppArmor: Fix unpack of network tables." Date: Wed, 10 Aug 2011 22:02:35 -0700 Message-Id: <1313038967-19941-2-git-send-email-john.johansen@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1313038967-19941-1-git-send-email-john.johansen@canonical.com> References: <1313038967-19941-1-git-send-email-john.johansen@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This reverts commit 233dad6fd0222c085ff7429e959fb4dbb7b7fd5c. --- security/apparmor/policy_unpack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index f4874c4..f78370b 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -580,7 +580,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e) /* discard extraneous rules that this kernel will * never request */ - if (i >= AF_MAX) { + if (i > AF_MAX) { u16 tmp; if (!unpack_u16(e, &tmp, NULL) || !unpack_u16(e, &tmp, NULL) ||