Add patch to libsepol to fix semantic level issue.

This commit is contained in:
Chris PeBenito 2015-02-23 08:48:21 -05:00
parent fd8aff429d
commit f37809937c
3 changed files with 22 additions and 0 deletions

View File

@ -41,6 +41,7 @@ before_install:
# Download current SELinux userspace tools and libraries
- curl -sS -L https://github.com/SELinuxProject/selinux/archive/20150202.tar.gz | tar xz
- mv selinux-20150202 selinux-src
- patch -p1 -d selinux-src < patches/sepol-2.4-mls-semantic-level-expand.patch
# Ubuntu 12.04 coreutils is too old to provide "ln --relative" :(
- sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libsepol/src/Makefile

1
patches/README Normal file
View File

@ -0,0 +1 @@
If there is a bug in one of SETools' dependencies, patches can be put here.

View File

@ -0,0 +1,20 @@
diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
index 467f7a7..3193ef5 100644
--- a/libsepol/src/expand.c
+++ b/libsepol/src/expand.c
@@ -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!");
--
2.3.0