projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()
[cascardo/linux.git]
/
security
/
selinux
/
ss
/
services.c
diff --git
a/security/selinux/ss/services.c
b/security/selinux/ss/services.c
index
a1d3944
..
9e2d820
100644
(file)
--- a/
security/selinux/ss/services.c
+++ b/
security/selinux/ss/services.c
@@
-3179,13
+3179,9
@@
int security_netlbl_secattr_to_sid(struct netlbl_lsm_secattr *secattr,
ctx_new.type = ctx->type;
mls_import_netlbl_lvl(&ctx_new, secattr);
if (secattr->flags & NETLBL_SECATTR_MLS_CAT) {
ctx_new.type = ctx->type;
mls_import_netlbl_lvl(&ctx_new, secattr);
if (secattr->flags & NETLBL_SECATTR_MLS_CAT) {
- rc = ebitmap_netlbl_import(&ctx_new.range.level[0].cat,
- secattr->attr.mls.cat);
+ rc = mls_import_netlbl_cat(&ctx_new, secattr);
if (rc)
goto out;
if (rc)
goto out;
- memcpy(&ctx_new.range.level[1].cat,
- &ctx_new.range.level[0].cat,
- sizeof(ctx_new.range.level[0].cat));
}
rc = -EIDRM;
if (!mls_context_isvalid(&policydb, &ctx_new))
}
rc = -EIDRM;
if (!mls_context_isvalid(&policydb, &ctx_new))