From patchwork Tue Apr 13 07:09:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 50044 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 86CFEB7CF5 for ; Tue, 13 Apr 2010 17:10:41 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1aGa-0006Fk-00; Tue, 13 Apr 2010 08:10:36 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1aGC-0005uy-Un for kernel-team@lists.ubuntu.com; Tue, 13 Apr 2010 08:10:13 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O1aGC-0003R8-Nq; Tue, 13 Apr 2010 08:10:12 +0100 Received: from [96.225.230.137] (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 1O1aGC-0002bR-Bl; Tue, 13 Apr 2010 08:10:12 +0100 From: john.johansen@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 10/11] AppArmor: make the global side the correct type Date: Tue, 13 Apr 2010 00:09:39 -0700 Message-Id: <1271142580-26555-11-git-send-email-john.johansen@canonical.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1271142580-26555-1-git-send-email-john.johansen@canonical.com> References: <1271142580-26555-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 From: John Johansen OriginalAuthor: John Johansen OriginalLocation: git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparm$ commit: e033dc48e794368f00fa70c2f17ee6e37165069e BugLink: http://bugs.launchpad.net/bugs/562047 The global sid type was not properly updated when the sid was transitioned from a u16:u16 pair of global and user sid to a single u32 sid. This causes the sid to wrap, this won't cause problems for mediation, but could conceivably cause problems for an extremely long lived learning session where profile are frequently replaced. Signed-off-by: John Johansen Acked-by: Andy Whitcroft --- security/apparmor/sid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/apparmor/sid.c b/security/apparmor/sid.c index e0b76de..5e73c62 100644 --- a/security/apparmor/sid.c +++ b/security/apparmor/sid.c @@ -24,7 +24,7 @@ #include "include/sid.h" /* global counter from which sids are allocated */ -static u16 global_sid; +static u32 global_sid; static DEFINE_SPINLOCK(sid_lock); /* TODO FIXME: add sid to profile mapping, and sid recycling */