mirror of
https://github.com/SELinuxProject/selinux
synced 2024-12-25 15:32:07 +00:00
Merge branch 'master' of github.com:SELinuxProject/selinux
This commit is contained in:
commit
cc8995f08c
@ -1,3 +1,4 @@
|
||||
* Fix error path in mls_semantic_level_expand(), from Chris PeBenito.
|
||||
* Fix MacOS X build, from Stephen Smalley.
|
||||
* Enabling building CIL in Android, from Stephen Smalley.
|
||||
* Update to latest CIL, includes new name resolution and fixes ordering
|
||||
|
@ -914,10 +914,11 @@ int mls_semantic_level_expand(mls_semantic_level_t * sl, mls_level_t * l,
|
||||
}
|
||||
for (i = cat->low - 1; i < cat->high; i++) {
|
||||
if (!ebitmap_get_bit(&levdatum->level->cat, i)) {
|
||||
ERR(h, "Category %s can not be associate with "
|
||||
ERR(h, "Category %s can not be associated with "
|
||||
"level %s",
|
||||
p->p_cat_val_to_name[i],
|
||||
p->p_sens_val_to_name[l->sens - 1]);
|
||||
return -1;
|
||||
}
|
||||
if (ebitmap_set_bit(&l->cat, i, 1)) {
|
||||
ERR(h, "Out of memory!");
|
||||
|
Loading…
Reference in New Issue
Block a user