diff options
author | James Morris <jmorris@namei.org> | 2010-03-01 09:36:31 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-03-01 09:36:31 +1100 |
commit | b4ccebdd37ff70d349321a198f416ba737a5e833 (patch) | |
tree | 275d717070346722c3aacd8355fb4f743216e03b /security/selinux/ss/mls.h | |
parent | Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | SELinux: Make selinux_kernel_create_files_as() shouldn't just always return 0 (diff) | |
download | linux-dev-b4ccebdd37ff70d349321a198f416ba737a5e833.tar.xz linux-dev-b4ccebdd37ff70d349321a198f416ba737a5e833.zip |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/selinux/ss/mls.h')
-rw-r--r-- | security/selinux/ss/mls.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h index 1276715aaa8b..cd9152632e54 100644 --- a/security/selinux/ss/mls.h +++ b/security/selinux/ss/mls.h @@ -39,6 +39,8 @@ int mls_context_to_sid(struct policydb *p, int mls_from_string(char *str, struct context *context, gfp_t gfp_mask); +int mls_range_set(struct context *context, struct mls_range *range); + int mls_convert_context(struct policydb *oldp, struct policydb *newp, struct context *context); |