diff options
| author | James Morris <jmorris@namei.org> | 2010-05-18 08:57:00 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-18 08:57:00 +1000 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /security/selinux/ss/mls.c | |
| parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
| parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss/mls.c')
| -rw-r--r-- | security/selinux/ss/mls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c index 372b773f8210..b4eff7a60c50 100644 --- a/security/selinux/ss/mls.c +++ b/security/selinux/ss/mls.c @@ -255,7 +255,7 @@ int mls_context_to_sid(struct policydb *pol, if (!pol->mls_enabled) { if (def_sid != SECSID_NULL && oldc) - *scontext += strlen(*scontext)+1; + *scontext += strlen(*scontext) + 1; return 0; } |