RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-26 07:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:SELinuxProject/selinux

Browse Source
This commit is contained in:
Stephen Smalley 2015-02-23 09:08:35 -05:00
commit cc8995f08c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsepol/ChangeLog
View File

@ -1,3 +1,4 @@
* Fix error path in mls_semantic_level_expand(), from Chris PeBenito.
* Fix MacOS X build, from Stephen Smalley. * Fix MacOS X build, from Stephen Smalley.
* Enabling building CIL in Android, from Stephen Smalley. * Enabling building CIL in Android, from Stephen Smalley.
* Update to latest CIL, includes new name resolution and fixes ordering * Update to latest CIL, includes new name resolution and fixes ordering

3
libsepol/src/expand.c
View File

@ -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++) { for (i = cat->low - 1; i < cat->high; i++) {
if (!ebitmap_get_bit(&levdatum->level->cat, 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", "level %s",
p->p_cat_val_to_name[i], p->p_cat_val_to_name[i],
p->p_sens_val_to_name[l->sens - 1]); p->p_sens_val_to_name[l->sens - 1]);
return -1;
} }
if (ebitmap_set_bit(&l->cat, i, 1)) { if (ebitmap_set_bit(&l->cat, i, 1)) {
ERR(h, "Out of memory!"); ERR(h, "Out of memory!");