libsepol: Move the PERMISSION_MASK macro to private.h
PATCH 1/2 libsepol: Move the PERMISSION_MASK macro to private.h
Move the PERMISSION_MASK macro from policydb_validate.c to private.h so that it can be used in other places.
--- libsepol/src/policydb_validate.c | 3 --- libsepol/src/private.h | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-)
libsepol/src/policydb_validate.c +0 -3
@@ -18,9 +18,6 @@* Check that at least one permission bit is valid. * Older compilers might set invalid bits for the wildcard permission. */ -#define PERMISSION_MASK (nprim) \ - ((nprim) == PERM_SYMTAB_SIZE ? (~UINT32_C(0)) : \ - ((UINT32_C(1) << (nprim)) - 1))#define NO_VALID_PERMS (av, nprim) (!((av) & PERMISSION_MASK(nprim))) typedef struct validate {
libsepol/src/private.h +4 -0
@@ -45,6 +45,10 @@#define MAX_ALIAS_REPEATS 32 +#define PERMISSION_MASK (nprim) \ + ((nprim) == PERM_SYMTAB_SIZE ? (~UINT32_C(0)) : \ + ((UINT32_C(1) << (nprim)) - 1)) +static inline int exceeds_available_bytes (const struct policy_file *fp,size_t x,size_t req_elem_size) {
Signature · 1 line
2.55.0
PATCH 2/2 libsepol: Remove junk permissions before optimzing the policy
In older policy compilers, a wildcard or complement would cause all the bits higher than those corresponding to the class's declared permissions to be set. These junk bits must be removed before optimization is done to avoid a situation where the only bits left for an access vector are one or more of these junk bits. If a policy does not have at least one actual permission bit set, it will fail validation.
--- libsepol/src/optimize.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
libsepol/src/optimize.c +29 -0
@@ -446,6 +446,32 @@ static void optimize_cond_avtab(policydb_t *p, const struct type_vec *type_map) } } +/* +* Older policy compilers could set bits higher than any of the permissions +* in the class. These junk bits must be removed before optimization to keep +* redundant rules from being kept because of junk bits and to prevent the +* failure of policy validation because no actual permission bit is set. +*/ +static int remove_junk_permissions (avtab_key_t *k,avtab_datum_t *d,void *args) +{ +const policydb_t *p = args; +const class_datum_t *tclass; +uint32_t mask; + +if (!(k->specified &AVTAB_AV )) +return 0 ; + + tclass = p->class_val_to_struct[k->target_class -1 ]; + mask =PERMISSION_MASK (tclass->permissions.nprim); + +if ((k->specified & ~AVTAB_ENABLED ) ==AVTAB_AUDITDENY ) + d->data |= ~mask; +else + d->data &= mask; + +return 0 ; +} +int policydb_optimize (policydb_t *p) {struct type_vec *type_map;
@@ -453,6 +479,9 @@ int policydb_optimize(policydb_t *p)if (p->policy_type !=POLICY_KERN )return -1 ; +avtab_map (&p->te_avtab, remove_junk_permissions, p); +avtab_map (&p->te_cond_avtab, remove_junk_permissions, p); + type_map =build_type_map (p);if (!type_map)return -1 ;
Signature · 1 line
2.55.0
Re: [PATCH 2/2] libsepol: Remove junk permissions before optimzing the policy
Quoted 10 lines · James Carter
In older policy compilers, a wildcard or complement would cause all the bits higher than those corresponding to the class's declared permissions to be set. These junk bits must be removed before optimization is done to avoid a situation where the only bits left for an access vector are one or more of these junk bits. If a policy does not have at least one actual permission bit set, it will fail validation.
Signed-off-by James Carter <[email protected]>
Quoted 5 lines · James Carter
Move the
PERMISSION_MASKmacro frompolicydb_validate.ctoprivate.hso that it can be used in other places.Signed-off-by James Carter <[email protected]>
Stephen Smalley
maintainerQuoted 9 lines · Stephen Smalley
Quoted 5 lines · James Carter
Move the
PERMISSION_MASKmacro frompolicydb_validate.ctoprivate.hso that it can be used in other places.Signed-off-by James Carter <[email protected]>Acked-by Stephen Smalley <[email protected]>
Both merged.