On 5/22/19 12:42 PM, Richard Haines wrote:
These patches require [1] and [2] be installed first. They have
been implemented on Android and sent to the selinux list, however their
merge has been deferred. They will install the core hashing of
file_context entries and fix root stem processing.
Patch 1/3 updates selinux_restorecon() replacing the per-mountpoint
security.restorecon_last attribute with a per-directory security.sehash
attribute computed from only those file contexts entries that partially
match the directory. This is to avoid the need to walk the entire tree
when any part of file_contexts changes, limiting relabels to only those
parts of the tree that could have changed.
One change is to add a new selabel_get_digests_all_partial_matches(3)
function that is explained in the man page. This could replace the Android
version of selabel_hash_all_partial_matches(3), that could then be
converted into a local function (The Android team would need to approve).
Has Android sorted out all of the ramifications of this change? What
about the triggering of CAP_SYS_ADMIN denials for setting the
security.sehash attribute?
Patches 2/3 and 3/3 update restorecon, setfiles and restorecond.
I will send a patch for the selinux-testsuite that will perform tests on
the new code.
[1] https://lore.kernel.org/selinux/20190311222442.49824-1-xunchang@xxxxxxxxxx/
[2] https://lore.kernel.org/selinux/20190417180955.136942-1-xunchang@xxxxxxxxxx/
Richard Haines (3):
libselinux: Save digest of all partial matches for directory
setfiles: Update utilities for the new digest scheme
restorecond: Update to handle new digest scheme
libselinux/include/selinux/label.h | 5 +
libselinux/include/selinux/restorecon.h | 17 +-
.../selabel_get_digests_all_partial_matches.3 | 70 +++++
libselinux/man/man3/selinux_restorecon.3 | 91 +++---
.../man3/selinux_restorecon_default_handle.3 | 9 +-
.../man/man3/selinux_restorecon_xattr.3 | 11 +-
libselinux/src/label.c | 15 +
libselinux/src/label_file.c | 51 ++++
libselinux/src/label_file.h | 4 +
libselinux/src/label_internal.h | 5 +
libselinux/src/selinux_restorecon.c | 267 +++++++++++-------
libselinux/utils/.gitignore | 1 +
.../selabel_get_digests_all_partial_matches.c | 170 +++++++++++
policycoreutils/setfiles/restore.c | 7 +-
policycoreutils/setfiles/restore.h | 2 +-
policycoreutils/setfiles/restorecon.8 | 10 +-
policycoreutils/setfiles/restorecon_xattr.8 | 19 +-
policycoreutils/setfiles/restorecon_xattr.c | 66 +----
policycoreutils/setfiles/setfiles.8 | 10 +-
policycoreutils/setfiles/setfiles.c | 19 +-
restorecond/restore.c | 8 +-
restorecond/restore.h | 2 +-
restorecond/restorecond.c | 5 +-
23 files changed, 593 insertions(+), 271 deletions(-)
create mode 100644 libselinux/man/man3/selabel_get_digests_all_partial_matches.3
create mode 100644 libselinux/utils/selabel_get_digests_all_partial_matches.c
