Skip to content

Commit

Permalink
Reorder statements to work around libcascade bug
Browse files Browse the repository at this point in the history
Let bindings and module definitions should not be order dependent.  Due
to a current libcascade bug that is expected to be carried into 0.1,
they are order dependent.  Reorder to make current libcascade happy, and
revert this after the bug is fixed.

dburgener/cascade#167
  • Loading branch information
dburgener committed Apr 12, 2023
1 parent 09ba587 commit 78b0dbf
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion policy/kernel/device_api.cas
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// General object class sets
//

let devfile_class_set = [ blk_file chr_file ];
// Moved to file_low_api.cas to work around libcascade bug


//
Expand Down
12 changes: 7 additions & 5 deletions policy/kernel/file_low_api.cas
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@ let files_loose_execmod = false;
// General object class sets
//

// All directory and file classes
let dir_file_class_set = [ dir file_class_set ];

// All non-directory file classes.
let file_class_set = [ devfile_class_set notdevfile_class_set ];
let devfile_class_set = [ blk_file chr_file ];

// Non-device file classes.
let notdevfile_class_set = [ fifo_file file lnk_file sock_file ];

// Non-device file classes.
let dir_notdevfile_class_set = [ dir notdevfile_class_set ];

// All non-directory file classes.
let file_class_set = [ devfile_class_set notdevfile_class_set ];

// All directory and file classes
let dir_file_class_set = [ dir file_class_set ];

//
// Low-level regular file API
//
Expand Down
16 changes: 8 additions & 8 deletions policy/system/selinuxutil.cas
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,14 @@ module selinuxutil_base {
resource selinux_policy_t;
}

module semanage {
domain semanage_t;
}

module setfiles {
domain setfiles_t;
}

module selinuxutil {
module checkpolicy;
module selinuxutil_base;
Expand All @@ -519,11 +527,3 @@ module selinuxutil {
module semanage;
module setfiles;
}

module semanage {
domain semanage;
}

module setfiles {
domain setfiles_t;
}

0 comments on commit 78b0dbf

Please sign in to comment.