aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2010-04-12 23:30:22 -0700
committerLeann Ogasawara <leann.ogasawara@canonical.com>2010-06-14 08:51:09 -0700
commitacfe28126c3e9bd37c64d8a24a4df1d22cf5d2fc (patch)
tree51c6979a10a1887c9cc0f6d6262228ed41b6c0c8 /security
parent9f4d674ba0de3b40663ea4b7a8c307ba6e05abee (diff)
AppArmor: make the global side the correct type
OriginalAuthor: John Johansen <john.johansen@canonical.com> 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 <john.johansen@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'security')
-rw-r--r--security/apparmor/sid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/sid.c b/security/apparmor/sid.c
index e0b76dec855..5e73c62479e 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 */