libsepol: reject xperm av rules in conditional statements
PATCH 1/2 libsepol: reject xperm av rules in conditional statements
Extended permission and neverallow rules are not permitted in conditional statements.
This causes issues on policy optimization where avtab_search() might return a non extended permission rule when searching for one.
Found by oss-fuzz (#45327)
--- libsepol/src/policydb_validate.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
libsepol/src/policydb_validate.c +17 -11
@@ -658,7 +658,7 @@ bad:* Functions to validate a kernel policydb */ -static int validate_avtab_key (avtab_key_t *key,validate_t flavors[]) +static int validate_avtab_key (avtab_key_t *key,int conditional,validate_t flavors[]) {if (validate_value (key->source_type, &flavors[SYM_TYPES ])) goto bad;
@@ -670,13 +670,16 @@ static int validate_avtab_key(avtab_key_t *key, validate_t flavors[])case AVTAB_ALLOWED :case AVTAB_AUDITALLOW :case AVTAB_AUDITDENY : -case AVTAB_XPERMS_ALLOWED : -case AVTAB_XPERMS_AUDITALLOW : -case AVTAB_XPERMS_DONTAUDIT :case AVTAB_TRANSITION :case AVTAB_MEMBER :case AVTAB_CHANGE :break ; +case AVTAB_XPERMS_ALLOWED : +case AVTAB_XPERMS_AUDITALLOW : +case AVTAB_XPERMS_DONTAUDIT : +if (conditional) + goto bad; +break ;default : goto bad; }
@@ -691,7 +694,7 @@ static int validate_avtab_key_and_datum(avtab_key_t *k, avtab_datum_t *d, void * {validate_t *flavors = (validate_t *)args; -if (validate_avtab_key (k, flavors)) +if (validate_avtab_key (k,0 , flavors))return -1 ;if ((k->specified &AVTAB_TYPE ) &&validate_value (d->data, &flavors[SYM_TYPES ]))
@@ -716,7 +719,7 @@ static int validate_cond_av_list(sepol_handle_t *handle, cond_av_list_t *cond_avfor (; cond_av; cond_av = cond_av->next) {for (avtab_ptr = cond_av->node; avtab_ptr; avtab_ptr = avtab_ptr->next) { -if (validate_avtab_key (&avtab_ptr->key, flavors)) { +if (validate_avtab_key (&avtab_ptr->key,1 , flavors)) {ERR (handle,"Invalid cond av list" );return -1 ; }
@@ -726,7 +729,7 @@ static int validate_cond_av_list(sepol_handle_t *handle, cond_av_list_t *cond_avreturn 0 ; } -static int validate_avrules (sepol_handle_t *handle,avrule_t *avrule,validate_t flavors[]) +static int validate_avrules (sepol_handle_t *handle,avrule_t *avrule,int conditional,validate_t flavors[]) {class_perm_node_t *class;
@@ -746,14 +749,17 @@ static int validate_avrules(sepol_handle_t *handle, avrule_t *avrule, validate_tcase AVRULE_AUDITALLOW :case AVRULE_AUDITDENY :case AVRULE_DONTAUDIT : -case AVRULE_NEVERALLOW :case AVRULE_TRANSITION :case AVRULE_MEMBER :case AVRULE_CHANGE : +break ; +case AVRULE_NEVERALLOW :case AVRULE_XPERMS_ALLOWED :case AVRULE_XPERMS_AUDITALLOW :case AVRULE_XPERMS_DONTAUDIT :case AVRULE_XPERMS_NEVERALLOW : +if (conditional) + goto bad;break ;default : goto bad;
@@ -814,9 +820,9 @@ static int validate_cond_list(sepol_handle_t *handle, cond_list_t *cond, validat goto bad;if (validate_cond_av_list (handle, cond->false_list, flavors)) goto bad; -if (validate_avrules (handle, cond->avtrue_list, flavors)) +if (validate_avrules (handle, cond->avtrue_list,1 , flavors)) goto bad; -if (validate_avrules (handle, cond->avfalse_list, flavors)) +if (validate_avrules (handle, cond->avfalse_list,1 , flavors)) goto bad;if (validate_bool_id_array (handle, cond->bool_ids, cond->nbools, &flavors[SYM_BOOLS ])) goto bad;
@@ -1098,7 +1104,7 @@ static int validate_avrule_blocks(sepol_handle_t *handle, avrule_block_t *avrulefor (decl = avrule_block->branch_list; decl !=NULL ; decl = decl->next) {if (validate_cond_list (handle, decl->cond_list, flavors)) goto bad; -if (validate_avrules (handle, decl->avrules, flavors)) +if (validate_avrules (handle, decl->avrules,0 , flavors)) goto bad;if (validate_role_trans_rules (handle, decl->role_tr_rules, flavors)) goto bad;
Signature · 1 line
2.35.1
PATCH 2/2 libsepol: validate boolean datum arrays
Validate the boolean entries in the policy.
--- libsepol/src/policydb_validate.c | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+)
libsepol/src/policydb_validate.c +43 -0
@@ -577,6 +577,41 @@ static int validate_user_datum_wrapper(__attribute__((unused)) hashtab_key_t k,return validate_user_datum (margs->handle, d, margs->flavors, margs->mls); } +static int validate_bool_datum (sepol_handle_t *handle,cond_bool_datum_t *boolean,validate_t flavors[]) +{ +if (validate_value (boolean->s.value, &flavors[SYM_BOOLS ])) + goto bad; + +switch (boolean->state) { +case 0 : +case 1 : +break ; +default : + goto bad; + } + +switch (boolean->flags) { +case 0 : +case COND_BOOL_FLAGS_TUNABLE : +break ; +default : + goto bad; + } + +return 0 ; + +bad: +ERR (handle,"Invalid bool datum" ); +return -1 ; +} + +static int validate_bool_datum_wrapper (__attribute__((unused))hashtab_key_t k,hashtab_datum_t d,void *args) +{ +map_arg_t *margs = args; + +return validate_bool_datum (margs->handle, d, margs->flavors); +} +static int validate_datum_array_gaps (sepol_handle_t *handle,policydb_t *p,validate_t flavors[]) {unsigned int i;
@@ -607,6 +642,11 @@ static int validate_datum_array_gaps(sepol_handle_t *handle, policydb_t *p, vali goto bad; } +for (i =0 ; i < p->p_bools.nprim; i++) { +if (bool_xnor (p->bool_val_to_struct[i],ebitmap_get_bit (&flavors[SYM_BOOLS ].gaps, i))) + goto bad; + } +return 0 ; bad:
@@ -647,6 +687,9 @@ static int validate_datum_array_entries(sepol_handle_t *handle, policydb_t *p, vif (hashtab_map (p->p_cats.table, validate_datum, &flavors[SYM_CATS ])) goto bad; +if (hashtab_map (p->p_bools.table, validate_bool_datum_wrapper, &margs)) + goto bad; +return 0 ; bad:
Signature · 1 line
2.35.1
Quoted 10 lines · Christian Göttsche
Extended permission and neverallow rules are not permitted in conditional statements.
This causes issues on policy optimization where
avtab_search()might return a non extended permission rule when searching for one.Found by oss-fuzz (#45327)
Signed-off-by Christian Göttsche <[email protected]>
For both patches:
Quoted 107 lines
--- libsepol/src/policydb_validate.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)libsepol/src/policydb_validate.c +17
-12@@ -658,7 +658,7 @@ bad:* Functions to validate a kernel policydb */ -static int validate_avtab_key (avtab_key_t *key,validate_t flavors[]) +static int validate_avtab_key (avtab_key_t *key,int conditional,validate_t flavors[]) {if (validate_value (key->source_type, &flavors[SYM_TYPES ])) goto bad;@@ -670,13 +670,16 @@ static int validate_avtab_key(avtab_key_t *key, validate_t flavors[])case AVTAB_ALLOWED :case AVTAB_AUDITALLOW :case AVTAB_AUDITDENY : -case AVTAB_XPERMS_ALLOWED : -case AVTAB_XPERMS_AUDITALLOW : -case AVTAB_XPERMS_DONTAUDIT :case AVTAB_TRANSITION :case AVTAB_MEMBER :case AVTAB_CHANGE :break ; +case AVTAB_XPERMS_ALLOWED : +case AVTAB_XPERMS_AUDITALLOW : +case AVTAB_XPERMS_DONTAUDIT : +if (conditional) + goto bad; +break ;default : goto bad; }@@ -691,7 +694,7 @@ static int validate_avtab_key_and_datum(avtab_key_t *k, avtab_datum_t *d, void * {validate_t *flavors = (validate_t *)args; -if (validate_avtab_key (k, flavors)) +if (validate_avtab_key (k,0 , flavors))return -1 ;if ((k->specified &AVTAB_TYPE ) &&validate_value (d->data, &flavors[SYM_TYPES ]))@@ -716,7 +719,7 @@ static int validate_cond_av_list(sepol_handle_t *handle, cond_av_list_t *cond_avfor (; cond_av; cond_av = cond_av->next) {for (avtab_ptr = cond_av->node; avtab_ptr; avtab_ptr = avtab_ptr->next) { -if (validate_avtab_key (&avtab_ptr->key, flavors)) { +if (validate_avtab_key (&avtab_ptr->key,1 , flavors)) {ERR (handle,"Invalid cond av list" );return -1 ; }@@ -726,7 +729,7 @@ static int validate_cond_av_list(sepol_handle_t *handle, cond_av_list_t *cond_avreturn 0 ; } -static int validate_avrules (sepol_handle_t *handle,avrule_t *avrule,validate_t flavors[]) +static int validate_avrules (sepol_handle_t *handle,avrule_t *avrule,int conditional,validate_t flavors[]) {class_perm_node_t *class;@@ -746,14 +749,17 @@ static int validate_avrules(sepol_handle_t *handle, avrule_t *avrule, validate_tcase AVRULE_AUDITALLOW :case AVRULE_AUDITDENY :case AVRULE_DONTAUDIT : -case AVRULE_NEVERALLOW :case AVRULE_TRANSITION :case AVRULE_MEMBER :case AVRULE_CHANGE : +break ; +case AVRULE_NEVERALLOW :case AVRULE_XPERMS_ALLOWED :case AVRULE_XPERMS_AUDITALLOW :case AVRULE_XPERMS_DONTAUDIT :case AVRULE_XPERMS_NEVERALLOW : +if (conditional) + goto bad;break ;default : goto bad;@@ -814,9 +820,9 @@ static int validate_cond_list(sepol_handle_t *handle, cond_list_t *cond, validat goto bad;if (validate_cond_av_list (handle, cond->false_list, flavors)) goto bad; -if (validate_avrules (handle, cond->avtrue_list, flavors)) +if (validate_avrules (handle, cond->avtrue_list,1 , flavors)) goto bad; -if (validate_avrules (handle, cond->avfalse_list, flavors)) +if (validate_avrules (handle, cond->avfalse_list,1 , flavors)) goto bad;if (validate_bool_id_array (handle, cond->bool_ids, cond->nbools, &flavors[SYM_BOOLS ])) goto bad;@@ -1098,7 +1104,7 @@ static int validate_avrule_blocks(sepol_handle_t *handle, avrule_block_t *avrulefor (decl = avrule_block->branch_list; decl !=NULL ; decl = decl->next) {if (validate_cond_list (handle, decl->cond_list, flavors)) goto bad; -if (validate_avrules (handle, decl->avrules, flavors)) +if (validate_avrules (handle, decl->avrules,0 , flavors)) goto bad;if (validate_role_trans_rules (handle, decl->role_tr_rules, flavors)) goto bad; --2.35.1
Quoted 10 lines · James Carter
Quoted 7 lines · Christian Göttsche
Extended permission and neverallow rules are not permitted in conditional statements.
This causes issues on policy optimization where
avtab_search()might return a non extended permission rule when searching for one.
Quoted 7 lines
Quoted 3 lines
Found by oss-fuzz (#45327)
Signed-off-by Christian Göttsche <[email protected]>For both patches:
Acked-by James Carter <[email protected]>
These patches have been merged.
Thanks,
Jim
Quoted 107 lines
Quoted 107 lines
--- libsepol/src/policydb_validate.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)libsepol/src/policydb_validate.c +17
-12@@ -658,7 +658,7 @@ bad:* Functions to validate a kernel policydb */ -static int validate_avtab_key (avtab_key_t *key,validate_t flavors[]) +static int validate_avtab_key (avtab_key_t *key,int conditional,validate_t flavors[]) {if (validate_value (key->source_type, &flavors[SYM_TYPES ])) goto bad;@@ -670,13 +670,16 @@ static int validate_avtab_key(avtab_key_t *key, validate_t flavors[])case AVTAB_ALLOWED :case AVTAB_AUDITALLOW :case AVTAB_AUDITDENY : -case AVTAB_XPERMS_ALLOWED : -case AVTAB_XPERMS_AUDITALLOW : -case AVTAB_XPERMS_DONTAUDIT :case AVTAB_TRANSITION :case AVTAB_MEMBER :case AVTAB_CHANGE :break ; +case AVTAB_XPERMS_ALLOWED : +case AVTAB_XPERMS_AUDITALLOW : +case AVTAB_XPERMS_DONTAUDIT : +if (conditional) + goto bad; +break ;default : goto bad; }@@ -691,7 +694,7 @@ static int validate_avtab_key_and_datum(avtab_key_t *k, avtab_datum_t *d, void * {validate_t *flavors = (validate_t *)args; -if (validate_avtab_key (k, flavors)) +if (validate_avtab_key (k,0 , flavors))return -1 ;if ((k->specified &AVTAB_TYPE ) &&validate_value (d->data, &flavors[SYM_TYPES ]))@@ -716,7 +719,7 @@ static int validate_cond_av_list(sepol_handle_t *handle, cond_av_list_t *cond_avfor (; cond_av; cond_av = cond_av->next) {for (avtab_ptr = cond_av->node; avtab_ptr; avtab_ptr = avtab_ptr->next) { -if (validate_avtab_key (&avtab_ptr->key, flavors)) { +if (validate_avtab_key (&avtab_ptr->key,1 , flavors)) {ERR (handle,"Invalid cond av list" );return -1 ; }@@ -726,7 +729,7 @@ static int validate_cond_av_list(sepol_handle_t *handle, cond_av_list_t *cond_avreturn 0 ; } -static int validate_avrules (sepol_handle_t *handle,avrule_t *avrule,validate_t flavors[]) +static int validate_avrules (sepol_handle_t *handle,avrule_t *avrule,int conditional,validate_t flavors[]) {class_perm_node_t *class;@@ -746,14 +749,17 @@ static int validate_avrules(sepol_handle_t *handle, avrule_t *avrule, validate_tcase AVRULE_AUDITALLOW :case AVRULE_AUDITDENY :case AVRULE_DONTAUDIT : -case AVRULE_NEVERALLOW :case AVRULE_TRANSITION :case AVRULE_MEMBER :case AVRULE_CHANGE : +break ; +case AVRULE_NEVERALLOW :case AVRULE_XPERMS_ALLOWED :case AVRULE_XPERMS_AUDITALLOW :case AVRULE_XPERMS_DONTAUDIT :case AVRULE_XPERMS_NEVERALLOW : +if (conditional) + goto bad;break ;default : goto bad;@@ -814,9 +820,9 @@ static int validate_cond_list(sepol_handle_t *handle, cond_list_t *cond, validat goto bad;if (validate_cond_av_list (handle, cond->false_list, flavors)) goto bad; -if (validate_avrules (handle, cond->avtrue_list, flavors)) +if (validate_avrules (handle, cond->avtrue_list,1 , flavors)) goto bad; -if (validate_avrules (handle, cond->avfalse_list, flavors)) +if (validate_avrules (handle, cond->avfalse_list,1 , flavors)) goto bad;if (validate_bool_id_array (handle, cond->bool_ids, cond->nbools, &flavors[SYM_BOOLS ])) goto bad;@@ -1098,7 +1104,7 @@ static int validate_avrule_blocks(sepol_handle_t *handle, avrule_block_t *avrulefor (decl = avrule_block->branch_list; decl !=NULL ; decl = decl->next) {if (validate_cond_list (handle, decl->cond_list, flavors)) goto bad; -if (validate_avrules (handle, decl->avrules, flavors)) +if (validate_avrules (handle, decl->avrules,0 , flavors)) goto bad;if (validate_role_trans_rules (handle, decl->role_tr_rules, flavors)) goto bad; --2.35.1