aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/ss/mls.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@tigress.co.uk>2006-04-18 22:21:04 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-19 09:13:50 -0700
commitab5703b34237da7034800ec2466ceebf88a7e685 (patch)
tree1c319edf228bb9467a0b8b2bc2a069d0545f5c52 /security/selinux/ss/mls.c
parentdda27d1a55e185b0c5fd184b86ac26c66846f095 (diff)
downloadmrst-s0i3-test-ab5703b34237da7034800ec2466ceebf88a7e685.tar.gz
mrst-s0i3-test-ab5703b34237da7034800ec2466ceebf88a7e685.tar.xz
mrst-s0i3-test-ab5703b34237da7034800ec2466ceebf88a7e685.zip
[PATCH] selinux: Fix MLS compatibility off-by-one bug
Fix an off-by-one error in the MLS compatibility code that was causing contexts with a MLS suffix to be rejected, preventing sharing partitions between FC4 and FC5. Bug reported in https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=188068 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@redhat.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/selinux/ss/mls.c')
-rw-r--r--security/selinux/ss/mls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c
index 640d0bfdbc6..84047f69f9c 100644
--- a/security/selinux/ss/mls.c
+++ b/security/selinux/ss/mls.c
@@ -264,7 +264,7 @@ int mls_context_to_sid(char oldc,
if (!selinux_mls_enabled) {
if (def_sid != SECSID_NULL && oldc)
- *scontext += strlen(*scontext);
+ *scontext += strlen(*scontext)+1;
return 0;
}