Revert patch that was attempting to expand filetrans attributes, but is breaking filetrans rules

This commit is contained in:
rhatdan 2012-09-19 16:09:53 -04:00
parent 7a85deddcf
commit eb4908df1b
2 changed files with 6 additions and 18 deletions

View File

@ -12,7 +12,7 @@ index f90a48d..9152446 100644
__POLICYDB_CAPABILITY_MAX
};
diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
index 2003eb6..79587af 100644
index 2003eb6..a2d209c 100644
--- a/libsepol/src/expand.c
+++ b/libsepol/src/expand.c
@@ -49,6 +49,82 @@ typedef struct expand_state {
@ -120,22 +120,7 @@ index 2003eb6..79587af 100644
cur_rule = rules;
while (cur_rule) {
@@ -1370,19 +1456,27 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
ebitmap_init(&ttypes);
if (expand_convert_type_set(state->out, state->typemap,
- &cur_rule->stypes, &stypes, 1)) {
+ &cur_rule->stypes, &stypes, 0)) {
ERR(state->handle, "Out of memory!");
return -1;
}
if (expand_convert_type_set(state->out, state->typemap,
- &cur_rule->ttypes, &ttypes, 1)) {
+ &cur_rule->ttypes, &ttypes, 0)) {
ERR(state->handle, "Out of memory!");
return -1;
}
@@ -1383,6 +1469,14 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
mapped_otype = state->typemap[cur_rule->otype - 1];

View File

@ -1,7 +1,7 @@
Summary: SELinux binary policy manipulation library
Name: libsepol
Version: 2.1.8
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz
@ -99,6 +99,9 @@ exit 0
/%{_lib}/libsepol.so.1
%changelog
* Wed Sep 19 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.8-2
- Revert patch that was attempting to expand filetrans attributes, but is breaking filetrans rules
* Thu Sep 13 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.8-1
- Update to upstream
* fix neverallow checking on attributes