From patchwork Mon Nov 1 22:24:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 69851 X-Patchwork-Delegate: apw@canonical.com 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 EED471007D2 for ; Tue, 2 Nov 2010 09:24:34 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PD2nh-000664-TC; Mon, 01 Nov 2010 22:24:25 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1PD2ng-00065p-92 for kernel-team@lists.ubuntu.com; Mon, 01 Nov 2010 22:24:24 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1PD2ng-0002LP-64 for ; Mon, 01 Nov 2010 22:24:24 +0000 Received: from [12.157.84.185] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1PD2nf-0000gq-VY for kernel-team@lists.ubuntu.com; Mon, 01 Nov 2010 22:24:24 +0000 From: John Johansen To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: AppArmor: Fix unpack of network tables. Date: Mon, 1 Nov 2010 18:24:17 -0400 Message-Id: <1288650257-4289-2-git-send-email-john.johansen@canonical.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1288650257-4289-1-git-send-email-john.johansen@canonical.com> References: <1288650257-4289-1-git-send-email-john.johansen@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 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 The unpacking of network rules, unpacks 1 more rule than it should. It should drop all rules with network types AF_MAX or greater. Signed-off-by: John Johansen --- 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 c2b6225..d8ab6d3 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) ||