libsepol: Rename ioctl xperms structures and functions
PATCH 1/3 libsepol: Rename ioctl xperms structures and functions
The ioctl extended permission structures and functions can be reused for other extended permissions. Use the more generic term "xperm" instead of "ioctl".
--- checkpolicy/policy_define.c | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-)
checkpolicy/policy_define.c +36 -36
@@ -1874,27 +1874,27 @@ avrule_t *define_cond_pol_list(avrule_t * avlist, avrule_t * sl)return sl; } -typedef struct av_ioctl_range { +typedef struct av_xperm_range {uint16_t low;uint16_t high; -}av_ioctl_range_t ; +}av_xperm_range_t ; -struct av_ioctl_range_list { +struct av_xperm_range_list {uint8_t omit; -av_ioctl_range_t range; -struct av_ioctl_range_list *next; +av_xperm_range_t range; +struct av_xperm_range_list *next; }; -static int avrule_sort_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_sort_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *r, *r2, *sorted, *sortedhead =NULL ; +struct av_xperm_range_list *r, *r2, *sorted, *sortedhead =NULL ;/* order list by range.low */ for (r = *rangehead; r !=NULL ; r = r->next) { - sorted =malloc (sizeof (struct av_ioctl_range_list )); + sorted =malloc (sizeof (struct av_xperm_range_list ));if (sorted ==NULL ) goto error; -memcpy (sorted, r,sizeof (struct av_ioctl_range_list )); +memcpy (sorted, r,sizeof (struct av_xperm_range_list )); sorted->next =NULL ;if (sortedhead ==NULL ) { sortedhead = sorted;
@@ -1933,9 +1933,9 @@ error:return -1 ; } -static void avrule_merge_ioctls (struct av_ioctl_range_list **rangehead) +static void avrule_merge_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *r, *tmp; +struct av_xperm_range_list *r, *tmp; r = *rangehead;while (r !=NULL && r->next !=NULL ) {/* merge */
@@ -1952,15 +1952,15 @@ static void avrule_merge_ioctls(struct av_ioctl_range_list **rangehead) } } -static int avrule_read_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_read_xperm_ranges (struct av_xperm_range_list **rangehead) {char *id; -struct av_ioctl_range_list *rnew, *r =NULL ; +struct av_xperm_range_list *rnew, *r =NULL ;uint8_t omit =0 ; *rangehead =NULL ; -/* read in all the ioctl commands */ +/* read in all the ioctl/netlink commands */ while ((id =queue_remove (id_queue))) {if (strcmp (id,"~" ) ==0 ) {/* these are values to be omitted */
@@ -1979,7 +1979,7 @@ static int avrule_read_ioctls(struct av_ioctl_range_list **rangehead)free (id); }else {/* read in new low value */ - rnew =malloc (sizeof (struct av_ioctl_range_list )); + rnew =malloc (sizeof (struct av_xperm_range_list ));if (rnew ==NULL ) goto error; rnew->next =NULL ;
@@ -2006,11 +2006,11 @@ error: }/* flip to included ranges */ -static int avrule_omit_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_omit_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *rnew, *r, *newhead, *r2; +struct av_xperm_range_list *rnew, *r, *newhead, *r2; - rnew =calloc (1 ,sizeof (struct av_ioctl_range_list )); + rnew =calloc (1 ,sizeof (struct av_xperm_range_list ));if (!rnew) goto error;
@@ -2028,7 +2028,7 @@ static int avrule_omit_ioctls(struct av_ioctl_range_list **rangehead)while (r) { r2->range.high = r->range.low -1 ; - rnew =calloc (1 ,sizeof (struct av_ioctl_range_list )); + rnew =calloc (1 ,sizeof (struct av_xperm_range_list ));if (!rnew) goto error; r2->next = rnew;
@@ -2054,26 +2054,26 @@ error:return -1 ; } -static int avrule_ioctl_ranges (struct av_ioctl_range_list **rangelist) +static int avrule_xperm_ranges (struct av_xperm_range_list **rangelist) { -struct av_ioctl_range_list *rangehead; +struct av_xperm_range_list *rangehead;uint8_t omit;/* read in ranges to include and omit */ -if (avrule_read_ioctls (&rangehead)) +if (avrule_read_xperm_ranges (&rangehead))return -1 ;if (rangehead ==NULL ) { -yyerror ("error processing ioctl commands" ); +yyerror ("error processing ioctl/netlink commands" );return -1 ; } omit = rangehead->omit; -/* sort and merge the input ioctls */ -if (avrule_sort_ioctls (&rangehead)) +/* sort and merge the input ranges */ +if (avrule_sort_xperms (&rangehead))return -1 ; -avrule_merge_ioctls (&rangehead); +avrule_merge_xperms (&rangehead);/* flip ranges if these are omitted */ if (omit) { -if (avrule_omit_ioctls (&rangehead)) +if (avrule_omit_xperms (&rangehead))return -1 ; }
@@ -2261,11 +2261,11 @@ static int avrule_xperms_used(const av_extended_perms_t *xperms)#define IOC_DRIV (x) ((x) >> 8)#define IOC_FUNC (x) ((x) & 0xff)#define IOC_CMD (driver, func) (((driver) << 8) + (func)) -static int avrule_ioctl_partialdriver (struct av_ioctl_range_list *rangelist, +static int avrule_xperm_partialdriver (struct av_xperm_range_list *rangelist,av_extended_perms_t *complete_driver,av_extended_perms_t **extended_perms) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint8_t low, high;
@@ -2300,10 +2300,10 @@ static int avrule_ioctl_partialdriver(struct av_ioctl_range_list *rangelist, } -static int avrule_ioctl_completedriver (struct av_ioctl_range_list *rangelist, +static int avrule_ioctl_completedriver (struct av_xperm_range_list *rangelist,av_extended_perms_t **extended_perms) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint16_t low, high; xperms =calloc (1 ,sizeof (av_extended_perms_t));
@@ -2342,10 +2342,10 @@ static int avrule_ioctl_completedriver(struct av_ioctl_range_list *rangelist,return 0 ; } -static int avrule_ioctl_func (struct av_ioctl_range_list *rangelist, +static int avrule_ioctl_func (struct av_xperm_range_list *rangelist,av_extended_perms_t **extended_perms,unsigned int driver) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint16_t low, high;
@@ -2457,13 +2457,13 @@ static int avrule_cpy(avrule_t *dest, const avrule_t *src)static int define_te_avtab_ioctl (const avrule_t *avrule_template) {avrule_t *avrule; -struct av_ioctl_range_list *rangelist, *r; +struct av_xperm_range_list *rangelist, *r;av_extended_perms_t *complete_driver, *partial_driver, *xperms;unsigned int i;/* organize ioctl ranges */ -if (avrule_ioctl_ranges (&rangelist)) +if (avrule_xperm_ranges (&rangelist))return -1 ;/* create rule for ioctl driver types that are entirely enabled */
@@ -2482,7 +2482,7 @@ static int define_te_avtab_ioctl(const avrule_t *avrule_template) }/* flag ioctl driver codes that are partially enabled */ -if (avrule_ioctl_partialdriver (rangelist, complete_driver, &partial_driver)) +if (avrule_xperm_partialdriver (rangelist, complete_driver, &partial_driver))return -1 ;if (!partial_driver || !avrule_xperms_used (partial_driver))
Signature · 1 line
2.46.0.184.g6999bdac58-goog
PATCH 2/3 libsepol: Support nlmsg extended permissions
Add support for AVTAB_XPERMS_NLMSG as extended permissions for netlink sockets. The behaviour is similar to the existing AVTAB_XPERMS_IOCTLFUNCTION.
--- checkpolicy/policy_define.c | 64 +++++++++++++++-- checkpolicy/test/dismod.c | 2 + libsepol/cil/src/cil.c | 2 + libsepol/cil/src/cil_binary.c | 84 ++++++++++++++++------ libsepol/cil/src/cil_build_ast.c | 4 +- libsepol/cil/src/cil_internal.h | 2 + libsepol/cil/src/cil_policy.c | 2 + libsepol/cil/src/cil_verify.c | 3 + libsepol/cil/src/cil_write_ast.c | 16 ++++- libsepol/include/sepol/policydb/avtab.h | 1 + libsepol/include/sepol/policydb/policydb.h | 1 + libsepol/src/expand.c | 3 + libsepol/src/kernel_to_cil.c | 21 ++++-- libsepol/src/module_to_cil.c | 20 ++++-- libsepol/src/policydb_validate.c | 2 + libsepol/src/util.c | 14 ++-- 16 files changed, 200 insertions(+), 41 deletions(-)
checkpolicy/policy_define.c +60 -4
@@ -2342,8 +2342,8 @@ static int avrule_ioctl_completedriver(struct av_xperm_range_list *rangelist,return 0 ; } -static int avrule_ioctl_func (struct av_xperm_range_list *rangelist, -av_extended_perms_t **extended_perms,unsigned int driver) +static int avrule_xperm_func (struct av_xperm_range_list *rangelist, +av_extended_perms_t **extended_perms,unsigned int driver,uint8_t specified) {struct av_xperm_range_list *r;av_extended_perms_t *xperms;
@@ -2379,7 +2379,7 @@ static int avrule_ioctl_func(struct av_xperm_range_list *rangelist, high =IOC_FUNC (high);avrule_xperm_setrangebits (low, high, xperms); xperms->driver = driver; - xperms->specified =AVRULE_XPERMS_IOCTLFUNCTION ; + xperms->specified = specified; r = r->next; }
@@ -2495,7 +2495,61 @@ static int define_te_avtab_ioctl(const avrule_t *avrule_template)*/ i =0 ;while (xperms_for_each_bit (&i, partial_driver)) { -if (avrule_ioctl_func (rangelist, &xperms, i)) +if (avrule_xperm_func (rangelist, &xperms, i,AVRULE_XPERMS_IOCTLFUNCTION )) +return -1 ; + +if (xperms) { + avrule = (avrule_t *)calloc (1 ,sizeof (avrule_t)); +if (!avrule) { +yyerror ("out of memory" ); +return -1 ; + } +if (avrule_cpy (avrule, avrule_template)) +return -1 ; + avrule->xperms = xperms; +append_avrule (avrule); + } + } + +done: +if (partial_driver) +free (partial_driver); + +while (rangelist !=NULL ) { + r = rangelist; + rangelist = rangelist->next; +free (r); + } + +return 0 ; +} + +static int define_te_avtab_netlink (const avrule_t *avrule_template) +{ +avrule_t *avrule; +struct av_xperm_range_list *rangelist, *r; +av_extended_perms_t *partial_driver, *xperms; +unsigned int i; + +/* organize ranges */ +if (avrule_xperm_ranges (&rangelist)) +return -1 ; + +/* flag driver codes that are partially enabled */ +if (avrule_xperm_partialdriver (rangelist,NULL , &partial_driver)) +return -1 ; + +if (!partial_driver || !avrule_xperms_used (partial_driver)) + goto done; + +/* +* create rule for each partially used driver codes +* "partially used" meaning that the code number e.g. socket 0x89 +* has some permission bits set and others not set. +*/ + i =0 ; +while (xperms_for_each_bit (&i, partial_driver)) { +if (avrule_xperm_func (rangelist, &xperms, i,AVRULE_XPERMS_NLMSG ))return -1 ;if (xperms) {
@@ -2546,6 +2600,8 @@ int define_te_avtab_extended_perms(int which) id =queue_remove (id_queue);if (strcmp (id,"ioctl" ) ==0 ) { rc =define_te_avtab_ioctl (avrule_template); + }else if (strcmp (id,"nlmsg" ) ==0 ) { + rc =define_te_avtab_netlink (avrule_template); }else {yyerror2 ("only ioctl extended permissions are supported, found %s" , id); rc =-1 ;
checkpolicy/test/dismod.c +2 -0
@@ -353,6 +353,8 @@ static int display_avrule(avrule_t * avrule, policydb_t * policy, xperms.specified =AVTAB_XPERMS_IOCTLFUNCTION ; else if (avrule->xperms->specified == AVRULE_XPERMS_IOCTLDRIVER) xperms.specified = AVTAB_XPERMS_IOCTLDRIVER; + else if (avrule->xperms->specified == AVRULE_XPERMS_NLMSG) + xperms.specified = AVTAB_XPERMS_NLMSG; else {fprintf (fp," ERROR: no valid xperms specified\n" );return -1 ;
libsepol/cil/src/cil.c +2 -0
@@ -221,6 +221,7 @@ char *CIL_KEY_DONTAUDITX;char *CIL_KEY_NEVERALLOWX ;char *CIL_KEY_PERMISSIONX ;char *CIL_KEY_IOCTL ; +char *CIL_KEY_NLMSG ;char *CIL_KEY_UNORDERED ;char *CIL_KEY_SRC_INFO ;char *CIL_KEY_SRC_CIL ;
@@ -393,6 +394,7 @@ static void cil_init_keys(void)CIL_KEY_NEVERALLOWX =cil_strpool_add ("neverallowx" );CIL_KEY_PERMISSIONX =cil_strpool_add ("permissionx" );CIL_KEY_IOCTL =cil_strpool_add ("ioctl" ); +CIL_KEY_NLMSG =cil_strpool_add ("nlmsg" );CIL_KEY_UNORDERED =cil_strpool_add ("unordered" );CIL_KEY_SRC_INFO =cil_strpool_add ("<src_info>" );CIL_KEY_SRC_CIL =cil_strpool_add ("cil" );
libsepol/cil/src/cil_binary.c +64 -20
204 lines not on this page · raw message
libsepol/cil/src/cil_build_ast.c +3 -1
@@ -2153,8 +2153,10 @@ static int cil_fill_permissionx(struct cil_tree_node *parse_current, struct cil_if (parse_current->data ==CIL_KEY_IOCTL ) { permx->kind =CIL_PERMX_KIND_IOCTL ; + }else if (parse_current->data ==CIL_KEY_NLMSG ) { + permx->kind =CIL_PERMX_KIND_NLMSG ; }else { -cil_log (CIL_ERR ,"Unknown permissionx kind, %s. Must be \"ioctl\"\n" , (char *)parse_current->data); +cil_log (CIL_ERR ,"Unknown permissionx kind, %s. Must be \"ioctl\" or \"nlmsg\"\n" , (char *)parse_current->data); rc =SEPOL_ERR ; goto exit; }
libsepol/cil/src/cil_internal.h +2 -0
@@ -238,6 +238,7 @@ extern char *CIL_KEY_DONTAUDITX;extern char *CIL_KEY_NEVERALLOWX ;extern char *CIL_KEY_PERMISSIONX ;extern char *CIL_KEY_IOCTL ; +extern char *CIL_KEY_NLMSG ;extern char *CIL_KEY_UNORDERED ;extern char *CIL_KEY_SRC_INFO ;extern char *CIL_KEY_SRC_CIL ;
@@ -636,6 +637,7 @@ struct cil_avrule { };#define CIL_PERMX_KIND_IOCTL 1 +#define CIL_PERMX_KIND_NLMSG 2struct cil_permissionx {struct cil_symtab_datum datum;uint32_t kind;
libsepol/cil/src/cil_policy.c +2 -0
@@ -1112,6 +1112,8 @@ static void cil_xperms_to_policy(FILE *out, struct cil_permissionx *permx)if (permx->kind ==CIL_PERMX_KIND_IOCTL ) { kind ="ioctl" ; + }else if (permx->kind ==CIL_PERMX_KIND_NLMSG ) { + kind ="nlmsg" ; }else { kind ="???" ; }
libsepol/cil/src/cil_verify.c +3 -0
@@ -1513,6 +1513,9 @@ static int __cil_verify_permissionx(struct cil_permissionx *permx, struct cil_trcase CIL_PERMX_KIND_IOCTL : kind_str =CIL_KEY_IOCTL ;break ; +case CIL_PERMX_KIND_NLMSG : + kind_str =CIL_KEY_NLMSG ; +break ;default :cil_tree_log (node,CIL_ERR ,"Invalid permissionx kind (%d)" , permx->kind); rc =SEPOL_ERR ;
libsepol/cil/src/cil_write_ast.c +14 -2
@@ -303,7 +303,13 @@ static void write_permx(FILE *out, struct cil_permissionx *permx)fprintf (out,"%s" ,datum_to_str (DATUM (permx))); }else {fprintf (out,"(" ); -fprintf (out,"%s " , permx->kind ==CIL_PERMX_KIND_IOCTL ?"ioctl" :"<?KIND>" ); +if (permx->kind ==CIL_PERMX_KIND_IOCTL ) { +fprintf (out,"ioctl " ); + }else if (permx->kind ==CIL_PERMX_KIND_NLMSG ) { +fprintf (out,"nlmsg " ); + }else { +fprintf (out,"<?KIND> " ); + }fprintf (out,"%s " ,datum_or_str (DATUM (permx->obj), permx->obj_str));write_expr (out, permx->expr_str);fprintf (out,")" );
@@ -825,7 +831,13 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)case CIL_PERMISSIONX : {struct cil_permissionx *permx = node->data;fprintf (out,"(permissionx %s (" ,datum_to_str (DATUM (permx))); -fprintf (out,"%s " , permx->kind ==CIL_PERMX_KIND_IOCTL ?"ioctl" :"<?KIND>" ); +if (permx->kind ==CIL_PERMX_KIND_IOCTL ) { +fprintf (out,"ioctl " ); + }else if (permx->kind ==CIL_PERMX_KIND_NLMSG ) { +fprintf (out,"nlmsg " ); + }else { +fprintf (out,"<?KIND> " ); + }fprintf (out,"%s " ,datum_or_str (DATUM (permx->obj), permx->obj_str));write_expr (out, permx->expr_str);fprintf (out,"))\n" );
libsepol/include/sepol/policydb/avtab.h +1 -0
@@ -74,6 +74,7 @@ typedef struct avtab_extended_perms {#define AVTAB_XPERMS_IOCTLFUNCTION 0x01#define AVTAB_XPERMS_IOCTLDRIVER 0x02 +#define AVTAB_XPERMS_NLMSG 0x03/* extension of the avtab_key specified */ uint8_t specified;uint8_t driver;
libsepol/include/sepol/policydb/policydb.h +1 -0
@@ -259,6 +259,7 @@ typedef struct class_perm_node { typedef struct av_extended_perms { #define AVRULE_XPERMS_IOCTLFUNCTION 0x01 #define AVRULE_XPERMS_IOCTLDRIVER 0x02 +#define AVRULE_XPERMS_NLMSG 0x03 uint8_t specified; uint8_t driver; /* 256 bits of permissions */
libsepol/src/expand.c +3 -0
@@ -1821,6 +1821,9 @@ static int allocate_xperms(sepol_handle_t * handle, avtab_datum_t * avdatump,case AVRULE_XPERMS_IOCTLDRIVER : xperms->specified =AVTAB_XPERMS_IOCTLDRIVER ;break ; +case AVRULE_XPERMS_NLMSG : + xperms->specified =AVTAB_XPERMS_NLMSG ; +break ;default :return -1 ; }
libsepol/src/kernel_to_cil.c +15 -6
@@ -1651,7 +1651,8 @@ static char *xperms_to_str(const avtab_extended_perms_t *xperms)size_t remaining, size =128 ;if ((xperms->specified !=AVTAB_XPERMS_IOCTLFUNCTION ) - && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER )) { + && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER ) + && (xperms->specified !=AVTAB_XPERMS_NLMSG )) {return NULL ; }
@@ -1681,7 +1682,8 @@ retry:continue ; } -if (xperms->specified &AVTAB_XPERMS_IOCTLFUNCTION ) { +if ((xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION ) + || (xperms->specified ==AVTAB_XPERMS_NLMSG )) { value = xperms->driver<<8 | bit;if (in_range) { low_value = xperms->driver<<8 | low_bit;
@@ -1690,7 +1692,7 @@ retry: }else { len =snprintf (p, remaining," 0x%hx" , value); } - }else if (xperms->specified &AVTAB_XPERMS_IOCTLDRIVER ) { + }else if (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { value = bit <<8 ;if (in_range) { low_value = low_bit <<8 ;
@@ -1728,7 +1730,7 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_datuint32_t data = datum->data;type_datum_t *type;const char *flavor, *tgt; -char *src, *class, *perms, *new; +char *src, *class, *perms, *new, *xperm;char *rule =NULL ;switch (0xFFF & key->specified) {
@@ -1795,9 +1797,16 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_datERR (NULL ,"Failed to generate extended permission string" ); goto exit; } - +if (datum->xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION || datum->xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { + xperm = (char *)"ioctl" ; + }else if (datum->xperms->specified ==AVTAB_XPERMS_NLMSG ) { + xperm = (char *)"nlmsg" ; + }else { +ERR (NULL ,"Unknown extended permssion" ); + goto exit; + } rule =create_str ("(%s %s %s (%s %s (%s)))" , - flavor, src, tgt,"ioctl" , class, perms); + flavor, src, tgt, xperm, class, perms);free (perms); }else { new = pdb->p_type_val_to_name[data -1 ];
libsepol/src/module_to_cil.c +16 -4
@@ -630,7 +630,8 @@ static int xperms_to_cil(const av_extended_perms_t *xperms)int first =1 ;if ((xperms->specified !=AVTAB_XPERMS_IOCTLFUNCTION ) - && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER )) + && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER ) + && (xperms->specified !=AVTAB_XPERMS_NLMSG ))return -1 ;for (bit =0 ; bit <sizeof (xperms->perms)*8 ; bit++) {
@@ -652,7 +653,8 @@ static int xperms_to_cil(const av_extended_perms_t *xperms)else first =0 ; -if (xperms->specified &AVTAB_XPERMS_IOCTLFUNCTION ) { +if ((xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION ) + || (xperms->specified ==AVTAB_XPERMS_NLMSG )) { value = xperms->driver<<8 | bit;if (in_range) { low_value = xperms->driver<<8 | low_bit;
@@ -661,7 +663,7 @@ static int xperms_to_cil(const av_extended_perms_t *xperms) }else {cil_printf ("0x%hx" , value); } - }else if (xperms->specified &AVTAB_XPERMS_IOCTLDRIVER ) { + }else if (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { value = bit <<8 ;if (in_range) { low_value = low_bit <<8 ;
@@ -680,6 +682,7 @@ static int avrulex_to_cil(int indent, struct policydb *pdb, uint32_t type, const {int rc =-1 ;const char *rule; +const char *xperm;const struct class_perm_node *classperm;switch (type) {
@@ -701,10 +704,19 @@ static int avrulex_to_cil(int indent, struct policydb *pdb, uint32_t type, const goto exit; } +if (xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION || xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { + xperm ="ioctl" ; + }else if (xperms->specified ==AVTAB_XPERMS_NLMSG ) { + xperm ="nlmsg" ; + }else { +ERR (NULL ,"Unkown avrule xperms->specified: %i" , xperms->specified); + rc =-1 ; + goto exit; + }for (classperm = classperms; classperm !=NULL ; classperm = classperm->next) {cil_indent (indent);cil_printf ("(%s %s %s (%s %s (" , rule, src, tgt, -"ioctl" , pdb->p_class_val_to_name[classperm->tclass -1 ]); + xperm, pdb->p_class_val_to_name[classperm->tclass -1 ]);xperms_to_cil (xperms);cil_printf (")))\n" ); }
libsepol/src/policydb_validate.c +2 -0
@@ -921,6 +921,7 @@ static int validate_xperms(const avtab_extended_perms_t *xperms)switch (xperms->specified) {case AVTAB_XPERMS_IOCTLDRIVER :case AVTAB_XPERMS_IOCTLFUNCTION : +case AVTAB_XPERMS_NLMSG :break ;default : goto bad;
@@ -1067,6 +1068,7 @@ static int validate_avrules(sepol_handle_t *handle, const avrule_t *avrule, intswitch (avrule->xperms->specified) {case AVRULE_XPERMS_IOCTLFUNCTION :case AVRULE_XPERMS_IOCTLDRIVER : +case AVRULE_XPERMS_NLMSG :break ;default : goto bad;
libsepol/src/util.c +10 -4
@@ -146,7 +146,8 @@ char *sepol_extended_perms_to_string(const avtab_extended_perms_t *xperms)size_t remaining, size =128 ;if ((xperms->specified !=AVTAB_XPERMS_IOCTLFUNCTION ) - && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER )) + && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER ) + && (xperms->specified !=AVTAB_XPERMS_NLMSG ))return NULL ; retry:
@@ -158,7 +159,12 @@ retry: buffer = p; remaining = size; - len =snprintf (p, remaining,"ioctl { " ); +if ((xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION ) + || (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER )) { + len =snprintf (p, remaining,"ioctl { " ); + }else { + len =snprintf (p, remaining,"nlmsg { " ); + }if (len <0 || (size_t )len >= remaining) goto err; p += len;
@@ -179,7 +185,7 @@ retry:continue ; } -if (xperms->specified &AVTAB_XPERMS_IOCTLFUNCTION ) { +if (xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION || xperms->specified ==AVTAB_XPERMS_NLMSG ) { value = xperms->driver<<8 | bit;if (in_range) { low_value = xperms->driver<<8 | low_bit;
@@ -187,7 +193,7 @@ retry: }else { len =snprintf (p, remaining,"0x%hx " , value); } - }else if (xperms->specified &AVTAB_XPERMS_IOCTLDRIVER ) { + }else if (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { value = bit <<8 ;if (in_range) { low_value = low_bit <<8 ;
Signature · 1 line
2.46.0.184.g6999bdac58-goog
PATCH 3/3 libsepol: Add policy capability netlink_xperm
In reply to Thiébaud WeksteenThis capability can be enabled to change the kernel's behaviour and use the extended permissions for netlink messages.
--- libsepol/include/sepol/policydb/polcaps.h | 1 + libsepol/src/polcaps.c | 1 + 2 files changed, 2 insertions(+)
libsepol/include/sepol/policydb/polcaps.h +1 -0
@@ -16,6 +16,7 @@ enum {POLICYDB_CAP_GENFS_SECLABEL_SYMLINKS ,POLICYDB_CAP_IOCTL_SKIP_CLOEXEC ,POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT , +POLICYDB_CAP_NETLINK_XPERM , __POLICYDB_CAP_MAX };#define POLICYDB_CAP_MAX (__POLICYDB_CAP_MAX - 1)
libsepol/src/polcaps.c +1 -0
@@ -15,6 +15,7 @@ static const char * const polcap_names[POLICYDB_CAP_MAX + 1] = { [POLICYDB_CAP_GENFS_SECLABEL_SYMLINKS] = "genfs_seclabel_symlinks", [POLICYDB_CAP_IOCTL_SKIP_CLOEXEC] = "ioctl_skip_cloexec", [POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT] = "userspace_initial_context", + [POLICYDB_CAP_NETLINK_XPERM] = "netlink_xperm", };int sepol_polcap_getnum (const char *name)
Signature · 1 line
2.46.0.184.g6999bdac58-goog
Quoted 6 lines · Thiébaud Weksteen
The ioctl extended permission structures and functions can be reused for other extended permissions. Use the more generic term "xperm" instead of "ioctl".
Signed-off-by Thiébaud Weksteen <[email protected]>
Quoted 212 lines
--- checkpolicy/policy_define.c | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-)checkpolicy/policy_define.c +36
-37@@ -1874,27 +1874,27 @@ avrule_t *define_cond_pol_list(avrule_t * avlist, avrule_t * sl)return sl; } -typedef struct av_ioctl_range { +typedef struct av_xperm_range {uint16_t low;uint16_t high; -}av_ioctl_range_t ; +}av_xperm_range_t ; -struct av_ioctl_range_list { +struct av_xperm_range_list {uint8_t omit; -av_ioctl_range_t range; -struct av_ioctl_range_list *next; +av_xperm_range_t range; +struct av_xperm_range_list *next; }; -static int avrule_sort_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_sort_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *r, *r2, *sorted, *sortedhead =NULL ; +struct av_xperm_range_list *r, *r2, *sorted, *sortedhead =NULL ;/* order list by range.low */ for (r = *rangehead; r !=NULL ; r = r->next) { - sorted =malloc (sizeof (struct av_ioctl_range_list )); + sorted =malloc (sizeof (struct av_xperm_range_list ));if (sorted ==NULL ) goto error; -memcpy (sorted, r,sizeof (struct av_ioctl_range_list )); +memcpy (sorted, r,sizeof (struct av_xperm_range_list )); sorted->next =NULL ;if (sortedhead ==NULL ) { sortedhead = sorted;@@ -1933,9 +1933,9 @@ error:return -1 ; } -static void avrule_merge_ioctls (struct av_ioctl_range_list **rangehead) +static void avrule_merge_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *r, *tmp; +struct av_xperm_range_list *r, *tmp; r = *rangehead;while (r !=NULL && r->next !=NULL ) {/* merge */ @@ -1952,15 +1952,15 @@ static void avrule_merge_ioctls(struct av_ioctl_range_list **rangehead) } } -static int avrule_read_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_read_xperm_ranges (struct av_xperm_range_list **rangehead) {char *id; -struct av_ioctl_range_list *rnew, *r =NULL ; +struct av_xperm_range_list *rnew, *r =NULL ;uint8_t omit =0 ; *rangehead =NULL ; -/* read in all the ioctl commands */ +/* read in all the ioctl/netlink commands */ while ((id =queue_remove (id_queue))) {if (strcmp (id,"~" ) ==0 ) {/* these are values to be omitted */ @@ -1979,7 +1979,7 @@ static int avrule_read_ioctls(struct av_ioctl_range_list **rangehead)free (id); }else {/* read in new low value */ - rnew =malloc (sizeof (struct av_ioctl_range_list )); + rnew =malloc (sizeof (struct av_xperm_range_list ));if (rnew ==NULL ) goto error; rnew->next =NULL ;@@ -2006,11 +2006,11 @@ error: }/* flip to included ranges */ -static int avrule_omit_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_omit_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *rnew, *r, *newhead, *r2; +struct av_xperm_range_list *rnew, *r, *newhead, *r2; - rnew =calloc (1 ,sizeof (struct av_ioctl_range_list )); + rnew =calloc (1 ,sizeof (struct av_xperm_range_list ));if (!rnew) goto error;@@ -2028,7 +2028,7 @@ static int avrule_omit_ioctls(struct av_ioctl_range_list **rangehead)while (r) { r2->range.high = r->range.low -1 ; - rnew =calloc (1 ,sizeof (struct av_ioctl_range_list )); + rnew =calloc (1 ,sizeof (struct av_xperm_range_list ));if (!rnew) goto error; r2->next = rnew;@@ -2054,26 +2054,26 @@ error:return -1 ; } -static int avrule_ioctl_ranges (struct av_ioctl_range_list **rangelist) +static int avrule_xperm_ranges (struct av_xperm_range_list **rangelist) { -struct av_ioctl_range_list *rangehead; +struct av_xperm_range_list *rangehead;uint8_t omit;/* read in ranges to include and omit */ -if (avrule_read_ioctls (&rangehead)) +if (avrule_read_xperm_ranges (&rangehead))return -1 ;if (rangehead ==NULL ) { -yyerror ("error processing ioctl commands" ); +yyerror ("error processing ioctl/netlink commands" );return -1 ; } omit = rangehead->omit; -/* sort and merge the input ioctls */ -if (avrule_sort_ioctls (&rangehead)) +/* sort and merge the input ranges */ +if (avrule_sort_xperms (&rangehead))return -1 ; -avrule_merge_ioctls (&rangehead); +avrule_merge_xperms (&rangehead);/* flip ranges if these are omitted */ if (omit) { -if (avrule_omit_ioctls (&rangehead)) +if (avrule_omit_xperms (&rangehead))return -1 ; }@@ -2261,11 +2261,11 @@ static int avrule_xperms_used(const av_extended_perms_t *xperms)#define IOC_DRIV (x) ((x) >> 8)#define IOC_FUNC (x) ((x) & 0xff)#define IOC_CMD (driver, func) (((driver) << 8) + (func)) -static int avrule_ioctl_partialdriver (struct av_ioctl_range_list *rangelist, +static int avrule_xperm_partialdriver (struct av_xperm_range_list *rangelist,av_extended_perms_t *complete_driver,av_extended_perms_t **extended_perms) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint8_t low, high;@@ -2300,10 +2300,10 @@ static int avrule_ioctl_partialdriver(struct av_ioctl_range_list *rangelist, } -static int avrule_ioctl_completedriver (struct av_ioctl_range_list *rangelist, +static int avrule_ioctl_completedriver (struct av_xperm_range_list *rangelist,av_extended_perms_t **extended_perms) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint16_t low, high; xperms =calloc (1 ,sizeof (av_extended_perms_t));@@ -2342,10 +2342,10 @@ static int avrule_ioctl_completedriver(struct av_ioctl_range_list *rangelist,return 0 ; } -static int avrule_ioctl_func (struct av_ioctl_range_list *rangelist, +static int avrule_ioctl_func (struct av_xperm_range_list *rangelist,av_extended_perms_t **extended_perms,unsigned int driver) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint16_t low, high;@@ -2457,13 +2457,13 @@ static int avrule_cpy(avrule_t *dest, const avrule_t *src)static int define_te_avtab_ioctl (const avrule_t *avrule_template) {avrule_t *avrule; -struct av_ioctl_range_list *rangelist, *r; +struct av_xperm_range_list *rangelist, *r;av_extended_perms_t *complete_driver, *partial_driver, *xperms;unsigned int i;/* organize ioctl ranges */ -if (avrule_ioctl_ranges (&rangelist)) +if (avrule_xperm_ranges (&rangelist))return -1 ;/* create rule for ioctl driver types that are entirely enabled */ @@ -2482,7 +2482,7 @@ static int define_te_avtab_ioctl(const avrule_t *avrule_template) }/* flag ioctl driver codes that are partially enabled */ -if (avrule_ioctl_partialdriver (rangelist, complete_driver, &partial_driver)) +if (avrule_xperm_partialdriver (rangelist, complete_driver, &partial_driver))return -1 ;if (!partial_driver || !avrule_xperms_used (partial_driver)) --2.46.0.184.g6999bdac58-goog
Re: [PATCH 2/3] libsepol: Support nlmsg extended permissions
In reply to Thiébaud WeksteenQuoted 6 lines · Thiébaud Weksteen
Add support for
AVTAB_XPERMS_NLMSGas extended permissions for netlink sockets. The behaviour is similar to the existingAVTAB_XPERMS_IOCTLFUNCTION.Signed-off-by Thiébaud Weksteen <[email protected]>
(side bar: would be nice to reduce the duplicated checking/handling of "ioctl" and "nlmsg" throughout, but you didn't introduce it for ioctl so not fair to require you to fix it)
Quoted 701 lines
--- checkpolicy/policy_define.c | 64 +++++++++++++++-- checkpolicy/test/dismod.c | 2 + libsepol/cil/src/cil.c | 2 + libsepol/cil/src/cil_binary.c | 84 ++++++++++++++++------ libsepol/cil/src/cil_build_ast.c | 4 +- libsepol/cil/src/cil_internal.h | 2 + libsepol/cil/src/cil_policy.c | 2 + libsepol/cil/src/cil_verify.c | 3 + libsepol/cil/src/cil_write_ast.c | 16 ++++- libsepol/include/sepol/policydb/avtab.h | 1 + libsepol/include/sepol/policydb/policydb.h | 1 + libsepol/src/expand.c | 3 + libsepol/src/kernel_to_cil.c | 21 ++++-- libsepol/src/module_to_cil.c | 20 ++++-- libsepol/src/policydb_validate.c | 2 + libsepol/src/util.c | 14 ++-- 16 files changed, 200 insertions(+), 41 deletions(-)checkpolicy/policy_define.c +60
-4@@ -2342,8 +2342,8 @@ static int avrule_ioctl_completedriver(struct av_xperm_range_list *rangelist,return 0 ; } -static int avrule_ioctl_func (struct av_xperm_range_list *rangelist, -av_extended_perms_t **extended_perms,unsigned int driver) +static int avrule_xperm_func (struct av_xperm_range_list *rangelist, +av_extended_perms_t **extended_perms,unsigned int driver,uint8_t specified) {struct av_xperm_range_list *r;av_extended_perms_t *xperms;@@ -2379,7 +2379,7 @@ static int avrule_ioctl_func(struct av_xperm_range_list *rangelist, high =IOC_FUNC (high);avrule_xperm_setrangebits (low, high, xperms); xperms->driver = driver; - xperms->specified =AVRULE_XPERMS_IOCTLFUNCTION ; + xperms->specified = specified; r = r->next; }@@ -2495,7 +2495,61 @@ static int define_te_avtab_ioctl(const avrule_t *avrule_template)*/ i =0 ;while (xperms_for_each_bit (&i, partial_driver)) { -if (avrule_ioctl_func (rangelist, &xperms, i)) +if (avrule_xperm_func (rangelist, &xperms, i,AVRULE_XPERMS_IOCTLFUNCTION )) +return -1 ; + +if (xperms) { + avrule = (avrule_t *)calloc (1 ,sizeof (avrule_t)); +if (!avrule) { +yyerror ("out of memory" ); +return -1 ; + } +if (avrule_cpy (avrule, avrule_template)) +return -1 ; + avrule->xperms = xperms; +append_avrule (avrule); + } + } + +done: +if (partial_driver) +free (partial_driver); + +while (rangelist !=NULL ) { + r = rangelist; + rangelist = rangelist->next; +free (r); + } + +return 0 ; +} + +static int define_te_avtab_netlink (const avrule_t *avrule_template) +{ +avrule_t *avrule; +struct av_xperm_range_list *rangelist, *r; +av_extended_perms_t *partial_driver, *xperms; +unsigned int i; + +/* organize ranges */ +if (avrule_xperm_ranges (&rangelist)) +return -1 ; + +/* flag driver codes that are partially enabled */ +if (avrule_xperm_partialdriver (rangelist,NULL , &partial_driver)) +return -1 ; + +if (!partial_driver || !avrule_xperms_used (partial_driver)) + goto done; + +/* +* create rule for each partially used driver codes +* "partially used" meaning that the code number e.g. socket 0x89 +* has some permission bits set and others not set. +*/ + i =0 ; +while (xperms_for_each_bit (&i, partial_driver)) { +if (avrule_xperm_func (rangelist, &xperms, i,AVRULE_XPERMS_NLMSG ))return -1 ;if (xperms) {@@ -2546,6 +2600,8 @@ int define_te_avtab_extended_perms(int which) id =queue_remove (id_queue);if (strcmp (id,"ioctl" ) ==0 ) { rc =define_te_avtab_ioctl (avrule_template); + }else if (strcmp (id,"nlmsg" ) ==0 ) { + rc =define_te_avtab_netlink (avrule_template); }else {yyerror2 ("only ioctl extended permissions are supported, found %s" , id); rc =-1 ;checkpolicy/test/dismod.c +2
-0@@ -353,6 +353,8 @@ static int display_avrule(avrule_t * avrule, policydb_t * policy, xperms.specified =AVTAB_XPERMS_IOCTLFUNCTION ; else if (avrule->xperms->specified == AVRULE_XPERMS_IOCTLDRIVER) xperms.specified = AVTAB_XPERMS_IOCTLDRIVER; + else if (avrule->xperms->specified == AVRULE_XPERMS_NLMSG) + xperms.specified = AVTAB_XPERMS_NLMSG; else {fprintf (fp," ERROR: no valid xperms specified\n" );return -1 ;libsepol/cil/src/cil.c +2
-0@@ -221,6 +221,7 @@ char *CIL_KEY_DONTAUDITX;char *CIL_KEY_NEVERALLOWX ;char *CIL_KEY_PERMISSIONX ;char *CIL_KEY_IOCTL ; +char *CIL_KEY_NLMSG ;char *CIL_KEY_UNORDERED ;char *CIL_KEY_SRC_INFO ;char *CIL_KEY_SRC_CIL ;@@ -393,6 +394,7 @@ static void cil_init_keys(void)CIL_KEY_NEVERALLOWX =cil_strpool_add ("neverallowx" );CIL_KEY_PERMISSIONX =cil_strpool_add ("permissionx" );CIL_KEY_IOCTL =cil_strpool_add ("ioctl" ); +CIL_KEY_NLMSG =cil_strpool_add ("nlmsg" );CIL_KEY_UNORDERED =cil_strpool_add ("unordered" );CIL_KEY_SRC_INFO =cil_strpool_add ("<src_info>" );CIL_KEY_SRC_CIL =cil_strpool_add ("cil" );libsepol/cil/src/cil_binary.c +64
-20@@ -66,6 +66,7 @@ struct cil_args_binary {int pass;hashtab_t role_trans_table;hashtab_t avrulex_ioctl_table; +hashtab_t avrulex_nlmsg_table;void **type_value_to_cil; };@@ -1671,11 +1672,22 @@ static void __avrule_xperm_setrangebits(uint16_t low, uint16_t high, struct avta } } +static char *__cil_xperm_kind_to_str (uint32_t xperm_kind) +{ +switch (xperm_kind) { +case CIL_PERMX_KIND_IOCTL : +return CIL_KEY_IOCTL ; +case CIL_PERMX_KIND_NLMSG : +return CIL_KEY_NLMSG ; +default : +return (char *)"unknown" ; + } +}#define IOC_DRIV (x) (x >> 8)#define IOC_FUNC (x) (x & 0xff) -static int __cil_permx_bitmap_to_sepol_xperms_list (ebitmap_t *xperms,struct cil_list **xperms_list) +static int __cil_permx_bitmap_to_sepol_xperms_list (uint32_t kind,ebitmap_t *xperms,struct cil_list **xperms_list) {ebitmap_node_t *node;unsigned int i;@@ -1705,7 +1717,7 @@ static int __cil_permx_bitmap_to_sepol_xperms_list(ebitmap_t *xperms, struct cil high = i; start_new_range =1 ; -if (IOC_FUNC (low) ==0x00 &&IOC_FUNC (high) ==0xff ) { +if (kind ==CIL_PERMX_KIND_IOCTL &&IOC_FUNC (low) ==0x00 &&IOC_FUNC (high) ==0xff ) {if (!complete) { complete =cil_calloc (1 ,sizeof (*complete)); complete->driver =0x0 ;@@ -1722,7 +1734,14 @@ static int __cil_permx_bitmap_to_sepol_xperms_list(ebitmap_t *xperms, struct cilif (!partial) { partial =cil_calloc (1 ,sizeof (*partial)); partial->driver =IOC_DRIV (low); - partial->specified =AVTAB_XPERMS_IOCTLFUNCTION ; +switch (kind) { +case CIL_PERMX_KIND_IOCTL : + partial->specified =AVTAB_XPERMS_IOCTLFUNCTION ; +break ; +case CIL_PERMX_KIND_NLMSG : + partial->specified =AVTAB_XPERMS_NLMSG ; +break ; + } }__avrule_xperm_setrangebits (IOC_FUNC (low),IOC_FUNC (high), partial);@@ -1740,7 +1759,7 @@ static int __cil_permx_bitmap_to_sepol_xperms_list(ebitmap_t *xperms, struct cilreturn SEPOL_OK ; } -static int __cil_avrulex_ioctl_to_policydb (hashtab_key_t k,hashtab_datum_t datum,void *args) +static int __cil_avrulex_xperm_to_policydb (hashtab_key_t k,hashtab_datum_t datum,uint32_t xperm_kind,void *args) {int rc =SEPOL_OK ;struct policydb *pdb;@@ -1750,6 +1769,7 @@ static int __cil_avrulex_ioctl_to_policydb(hashtab_key_t k, hashtab_datum_t datustruct cil_list_item *item;class_datum_t *sepol_obj;uint32_t data =0 ; +char *kind =NULL ; avtab_key = (avtab_key_t *)k; pdb = args;@@ -1759,13 +1779,14 @@ static int __cil_avrulex_ioctl_to_policydb(hashtab_key_t k, hashtab_datum_t datu// setting the data for an extended avtab isn't really necessary because // it is ignored by the kernel. However, neverallow checking requires that // the data value be set, so set it for that to work. - rc =__perm_str_to_datum (CIL_KEY_IOCTL , sepol_obj, &data); + kind =__cil_xperm_kind_to_str (xperm_kind); + rc =__perm_str_to_datum (kind, sepol_obj, &data);if (rc !=SEPOL_OK ) { goto exit; } avtab_datum.data = data; - rc =__cil_permx_bitmap_to_sepol_xperms_list (datum, &xperms_list); + rc =__cil_permx_bitmap_to_sepol_xperms_list (xperm_kind, datum, &xperms_list);if (rc !=SEPOL_OK ) { goto exit; }@@ -1790,7 +1811,15 @@ exit:return rc; } -static int __cil_avrulex_ioctl_to_hashtable (hashtab_t h,uint16_t kind,uint32_t src,uint32_t tgt,uint32_t obj,ebitmap_t *xperms) +static int __cil_avrulex_ioctl_to_policydb (hashtab_key_t k,hashtab_datum_t datum,void *args) { +return __cil_avrulex_xperm_to_policydb (k, datum,CIL_PERMX_KIND_IOCTL , args); +} + +static int __cil_avrulex_nlmsg_to_policydb (hashtab_key_t k,hashtab_datum_t datum,void *args) { +return __cil_avrulex_xperm_to_policydb (k, datum,CIL_PERMX_KIND_NLMSG , args); +} + +static int __cil_avrulex_xperm_to_hashtable (hashtab_t h,uint16_t kind,uint32_t src,uint32_t tgt,uint32_t obj,ebitmap_t *xperms) {uint16_t specified;avtab_key_t *avtab_key;@@ -1870,7 +1899,11 @@ static int __cil_avrulex_to_hashtable_helper(policydb_t *pdb, uint16_t kind, strswitch (permx->kind) {case CIL_PERMX_KIND_IOCTL : - rc =__cil_avrulex_ioctl_to_hashtable (args->avrulex_ioctl_table, kind, sepol_src->s.value, sepol_tgt->s.value, sepol_obj->s.value, permx->perms); + rc =__cil_avrulex_xperm_to_hashtable (args->avrulex_ioctl_table, kind, sepol_src->s.value, sepol_tgt->s.value, sepol_obj->s.value, permx->perms); +if (rc !=SEPOL_OK ) goto exit; +break ; +case CIL_PERMX_KIND_NLMSG : + rc =__cil_avrulex_xperm_to_hashtable (args->avrulex_nlmsg_table, kind, sepol_src->s.value, sepol_tgt->s.value, sepol_obj->s.value, permx->perms);if (rc !=SEPOL_OK ) goto exit;break ;default :@@ -2037,7 +2070,7 @@ exit:return rc; } -static int __cil_avrulex_ioctl_destroy (hashtab_key_t k,hashtab_datum_t datum, __attribute__((unused))void *args) +static int __cil_avrulex_xperm_destroy (hashtab_key_t k,hashtab_datum_t datum, __attribute__((unused))void *args) {free (k);ebitmap_destroy (datum);@@ -4630,6 +4663,9 @@ static int __cil_permx_to_sepol_class_perms(policydb_t *pdb, struct cil_permissicase CIL_PERMX_KIND_IOCTL : perm_str =CIL_KEY_IOCTL ;break ; +case CIL_PERMX_KIND_NLMSG : + perm_str =CIL_KEY_NLMSG ; +break ;default : rc =SEPOL_ERR ; goto exit;@@ -4769,17 +4805,10 @@ static void __cil_print_classperm(struct cil_list *cp_list)static void __cil_print_permissionx (struct cil_permissionx *px) { -const char *kind_str ="" ; +const char *kind_str =NULL ;char *expr_str; -switch (px->kind) { -case CIL_PERMX_KIND_IOCTL : - kind_str =CIL_KEY_IOCTL ; -break ; -default : - kind_str ="unknown" ; -break ; - } + kind_str =__cil_xperm_kind_to_str (px->kind);__cil_expr_to_string (px->expr_str,CIL_PERMISSIONX , &expr_str);@@ -4928,7 +4957,7 @@ static int cil_check_neverallow(const struct cil_db *db, policydb_t *pdb, struct goto exit; } - rc =__cil_permx_bitmap_to_sepol_xperms_list (cil_rule->perms.x.permx->perms, &xperms); + rc =__cil_permx_bitmap_to_sepol_xperms_list (cil_rule->perms.x.permx->kind, cil_rule->perms.x.permx->perms, &xperms);if (rc !=SEPOL_OK ) { goto exit; }@@ -5137,6 +5166,7 @@ int cil_binary_create_allocated_pdb(const struct cil_db *db, sepol_policydb_t *pstruct cil_list *neverallows =NULL ;hashtab_t role_trans_table =NULL ;hashtab_t avrulex_ioctl_table =NULL ; +hashtab_t avrulex_nlmsg_table =NULL ;void **type_value_to_cil =NULL ;struct cil_class **class_value_to_cil =NULL ;struct cil_perm ***perm_value_to_cil =NULL ;@@ -5184,6 +5214,12 @@ int cil_binary_create_allocated_pdb(const struct cil_db *db, sepol_policydb_t *p goto exit; } + avrulex_nlmsg_table =hashtab_create (avrulex_hash, avrulex_compare,AVRULEX_TABLE_SIZE ); +if (!avrulex_nlmsg_table) { +cil_log (CIL_INFO ,"Failure to create hashtab for avrulex\n" ); + goto exit; + } +cil_list_init (&neverallows,CIL_LIST_ITEM ); extra_args.db = db;@@ -5191,6 +5227,7 @@ int cil_binary_create_allocated_pdb(const struct cil_db *db, sepol_policydb_t *p extra_args.neverallows = neverallows; extra_args.role_trans_table = role_trans_table; extra_args.avrulex_ioctl_table = avrulex_ioctl_table; + extra_args.avrulex_nlmsg_table = avrulex_nlmsg_table; extra_args.type_value_to_cil = type_value_to_cil;for (i =1 ; i <=3 ; i++) {@@ -5216,6 +5253,11 @@ int cil_binary_create_allocated_pdb(const struct cil_db *db, sepol_policydb_t *pcil_log (CIL_INFO ,"Failure creating avrulex rules\n" ); goto exit; } + rc =hashtab_map (avrulex_nlmsg_table, __cil_avrulex_nlmsg_to_policydb, pdb); +if (rc !=SEPOL_OK ) { +cil_log (CIL_INFO ,"Failure creating avrulex rules\n" ); + goto exit; + } } }@@ -5287,8 +5329,10 @@ int cil_binary_create_allocated_pdb(const struct cil_db *db, sepol_policydb_t *p exit:hashtab_destroy (role_trans_table); -hashtab_map (avrulex_ioctl_table, __cil_avrulex_ioctl_destroy,NULL ); +hashtab_map (avrulex_ioctl_table, __cil_avrulex_xperm_destroy,NULL );hashtab_destroy (avrulex_ioctl_table); +hashtab_map (avrulex_nlmsg_table, __cil_avrulex_xperm_destroy,NULL ); +hashtab_destroy (avrulex_nlmsg_table);free (type_value_to_cil);free (class_value_to_cil);if (perm_value_to_cil !=NULL ) {libsepol/cil/src/cil_build_ast.c +3
-1@@ -2153,8 +2153,10 @@ static int cil_fill_permissionx(struct cil_tree_node *parse_current, struct cil_if (parse_current->data ==CIL_KEY_IOCTL ) { permx->kind =CIL_PERMX_KIND_IOCTL ; + }else if (parse_current->data ==CIL_KEY_NLMSG ) { + permx->kind =CIL_PERMX_KIND_NLMSG ; }else { -cil_log (CIL_ERR ,"Unknown permissionx kind, %s. Must be \"ioctl\"\n" , (char *)parse_current->data); +cil_log (CIL_ERR ,"Unknown permissionx kind, %s. Must be \"ioctl\" or \"nlmsg\"\n" , (char *)parse_current->data); rc =SEPOL_ERR ; goto exit; }libsepol/cil/src/cil_internal.h +2
-0@@ -238,6 +238,7 @@ extern char *CIL_KEY_DONTAUDITX;extern char *CIL_KEY_NEVERALLOWX ;extern char *CIL_KEY_PERMISSIONX ;extern char *CIL_KEY_IOCTL ; +extern char *CIL_KEY_NLMSG ;extern char *CIL_KEY_UNORDERED ;extern char *CIL_KEY_SRC_INFO ;extern char *CIL_KEY_SRC_CIL ;@@ -636,6 +637,7 @@ struct cil_avrule { };#define CIL_PERMX_KIND_IOCTL 1 +#define CIL_PERMX_KIND_NLMSG 2struct cil_permissionx {struct cil_symtab_datum datum;uint32_t kind;libsepol/cil/src/cil_policy.c +2
-0@@ -1112,6 +1112,8 @@ static void cil_xperms_to_policy(FILE *out, struct cil_permissionx *permx)if (permx->kind ==CIL_PERMX_KIND_IOCTL ) { kind ="ioctl" ; + }else if (permx->kind ==CIL_PERMX_KIND_NLMSG ) { + kind ="nlmsg" ; }else { kind ="???" ; }libsepol/cil/src/cil_verify.c +3
-0@@ -1513,6 +1513,9 @@ static int __cil_verify_permissionx(struct cil_permissionx *permx, struct cil_trcase CIL_PERMX_KIND_IOCTL : kind_str =CIL_KEY_IOCTL ;break ; +case CIL_PERMX_KIND_NLMSG : + kind_str =CIL_KEY_NLMSG ; +break ;default :cil_tree_log (node,CIL_ERR ,"Invalid permissionx kind (%d)" , permx->kind); rc =SEPOL_ERR ;libsepol/cil/src/cil_write_ast.c +14
-2@@ -303,7 +303,13 @@ static void write_permx(FILE *out, struct cil_permissionx *permx)fprintf (out,"%s" ,datum_to_str (DATUM (permx))); }else {fprintf (out,"(" ); -fprintf (out,"%s " , permx->kind ==CIL_PERMX_KIND_IOCTL ?"ioctl" :"<?KIND>" ); +if (permx->kind ==CIL_PERMX_KIND_IOCTL ) { +fprintf (out,"ioctl " ); + }else if (permx->kind ==CIL_PERMX_KIND_NLMSG ) { +fprintf (out,"nlmsg " ); + }else { +fprintf (out,"<?KIND> " ); + }fprintf (out,"%s " ,datum_or_str (DATUM (permx->obj), permx->obj_str));write_expr (out, permx->expr_str);fprintf (out,")" );@@ -825,7 +831,13 @@ void cil_write_ast_node(FILE *out, struct cil_tree_node *node)case CIL_PERMISSIONX : {struct cil_permissionx *permx = node->data;fprintf (out,"(permissionx %s (" ,datum_to_str (DATUM (permx))); -fprintf (out,"%s " , permx->kind ==CIL_PERMX_KIND_IOCTL ?"ioctl" :"<?KIND>" ); +if (permx->kind ==CIL_PERMX_KIND_IOCTL ) { +fprintf (out,"ioctl " ); + }else if (permx->kind ==CIL_PERMX_KIND_NLMSG ) { +fprintf (out,"nlmsg " ); + }else { +fprintf (out,"<?KIND> " ); + }fprintf (out,"%s " ,datum_or_str (DATUM (permx->obj), permx->obj_str));write_expr (out, permx->expr_str);fprintf (out,"))\n" );libsepol/include/sepol/policydb/avtab.h +1
-0@@ -74,6 +74,7 @@ typedef struct avtab_extended_perms {#define AVTAB_XPERMS_IOCTLFUNCTION 0x01#define AVTAB_XPERMS_IOCTLDRIVER 0x02 +#define AVTAB_XPERMS_NLMSG 0x03/* extension of the avtab_key specified */ uint8_t specified;uint8_t driver;libsepol/include/sepol/policydb/policydb.h +1
-0@@ -259,6 +259,7 @@ typedef struct class_perm_node { typedef struct av_extended_perms { #define AVRULE_XPERMS_IOCTLFUNCTION 0x01 #define AVRULE_XPERMS_IOCTLDRIVER 0x02 +#define AVRULE_XPERMS_NLMSG 0x03 uint8_t specified; uint8_t driver; /* 256 bits of permissions */libsepol/src/expand.c +3
-0@@ -1821,6 +1821,9 @@ static int allocate_xperms(sepol_handle_t * handle, avtab_datum_t * avdatump,case AVRULE_XPERMS_IOCTLDRIVER : xperms->specified =AVTAB_XPERMS_IOCTLDRIVER ;break ; +case AVRULE_XPERMS_NLMSG : + xperms->specified =AVTAB_XPERMS_NLMSG ; +break ;default :return -1 ; }libsepol/src/kernel_to_cil.c +15
-6@@ -1651,7 +1651,8 @@ static char *xperms_to_str(const avtab_extended_perms_t *xperms)size_t remaining, size =128 ;if ((xperms->specified !=AVTAB_XPERMS_IOCTLFUNCTION ) - && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER )) { + && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER ) + && (xperms->specified !=AVTAB_XPERMS_NLMSG )) {return NULL ; }@@ -1681,7 +1682,8 @@ retry:continue ; } -if (xperms->specified &AVTAB_XPERMS_IOCTLFUNCTION ) { +if ((xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION ) + || (xperms->specified ==AVTAB_XPERMS_NLMSG )) { value = xperms->driver<<8 | bit;if (in_range) { low_value = xperms->driver<<8 | low_bit;@@ -1690,7 +1692,7 @@ retry: }else { len =snprintf (p, remaining," 0x%hx" , value); } - }else if (xperms->specified &AVTAB_XPERMS_IOCTLDRIVER ) { + }else if (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { value = bit <<8 ;if (in_range) { low_value = low_bit <<8 ;@@ -1728,7 +1730,7 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_datuint32_t data = datum->data;type_datum_t *type;const char *flavor, *tgt; -char *src, *class, *perms, *new; +char *src, *class, *perms, *new, *xperm;char *rule =NULL ;switch (0xFFF & key->specified) {@@ -1795,9 +1797,16 @@ static char *avtab_node_to_str(struct policydb *pdb, avtab_key_t *key, avtab_datERR (NULL ,"Failed to generate extended permission string" ); goto exit; } - +if (datum->xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION || datum->xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { + xperm = (char *)"ioctl" ; + }else if (datum->xperms->specified ==AVTAB_XPERMS_NLMSG ) { + xperm = (char *)"nlmsg" ; + }else { +ERR (NULL ,"Unknown extended permssion" ); + goto exit; + } rule =create_str ("(%s %s %s (%s %s (%s)))" , - flavor, src, tgt,"ioctl" , class, perms); + flavor, src, tgt, xperm, class, perms);free (perms); }else { new = pdb->p_type_val_to_name[data -1 ];libsepol/src/module_to_cil.c +16
-4@@ -630,7 +630,8 @@ static int xperms_to_cil(const av_extended_perms_t *xperms)int first =1 ;if ((xperms->specified !=AVTAB_XPERMS_IOCTLFUNCTION ) - && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER )) + && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER ) + && (xperms->specified !=AVTAB_XPERMS_NLMSG ))return -1 ;for (bit =0 ; bit <sizeof (xperms->perms)*8 ; bit++) {@@ -652,7 +653,8 @@ static int xperms_to_cil(const av_extended_perms_t *xperms)else first =0 ; -if (xperms->specified &AVTAB_XPERMS_IOCTLFUNCTION ) { +if ((xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION ) + || (xperms->specified ==AVTAB_XPERMS_NLMSG )) { value = xperms->driver<<8 | bit;if (in_range) { low_value = xperms->driver<<8 | low_bit;@@ -661,7 +663,7 @@ static int xperms_to_cil(const av_extended_perms_t *xperms) }else {cil_printf ("0x%hx" , value); } - }else if (xperms->specified &AVTAB_XPERMS_IOCTLDRIVER ) { + }else if (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { value = bit <<8 ;if (in_range) { low_value = low_bit <<8 ;@@ -680,6 +682,7 @@ static int avrulex_to_cil(int indent, struct policydb *pdb, uint32_t type, const {int rc =-1 ;const char *rule; +const char *xperm;const struct class_perm_node *classperm;switch (type) {@@ -701,10 +704,19 @@ static int avrulex_to_cil(int indent, struct policydb *pdb, uint32_t type, const goto exit; } +if (xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION || xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { + xperm ="ioctl" ; + }else if (xperms->specified ==AVTAB_XPERMS_NLMSG ) { + xperm ="nlmsg" ; + }else { +ERR (NULL ,"Unkown avrule xperms->specified: %i" , xperms->specified); + rc =-1 ; + goto exit; + }for (classperm = classperms; classperm !=NULL ; classperm = classperm->next) {cil_indent (indent);cil_printf ("(%s %s %s (%s %s (" , rule, src, tgt, -"ioctl" , pdb->p_class_val_to_name[classperm->tclass -1 ]); + xperm, pdb->p_class_val_to_name[classperm->tclass -1 ]);xperms_to_cil (xperms);cil_printf (")))\n" ); }libsepol/src/policydb_validate.c +2
-0@@ -921,6 +921,7 @@ static int validate_xperms(const avtab_extended_perms_t *xperms)switch (xperms->specified) {case AVTAB_XPERMS_IOCTLDRIVER :case AVTAB_XPERMS_IOCTLFUNCTION : +case AVTAB_XPERMS_NLMSG :break ;default : goto bad;@@ -1067,6 +1068,7 @@ static int validate_avrules(sepol_handle_t *handle, const avrule_t *avrule, intswitch (avrule->xperms->specified) {case AVRULE_XPERMS_IOCTLFUNCTION :case AVRULE_XPERMS_IOCTLDRIVER : +case AVRULE_XPERMS_NLMSG :break ;default : goto bad;libsepol/src/util.c +10
-5@@ -146,7 +146,8 @@ char *sepol_extended_perms_to_string(const avtab_extended_perms_t *xperms)size_t remaining, size =128 ;if ((xperms->specified !=AVTAB_XPERMS_IOCTLFUNCTION ) - && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER )) + && (xperms->specified !=AVTAB_XPERMS_IOCTLDRIVER ) + && (xperms->specified !=AVTAB_XPERMS_NLMSG ))return NULL ; retry:@@ -158,7 +159,12 @@ retry: buffer = p; remaining = size; - len =snprintf (p, remaining,"ioctl { " ); +if ((xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION ) + || (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER )) { + len =snprintf (p, remaining,"ioctl { " ); + }else { + len =snprintf (p, remaining,"nlmsg { " ); + }if (len <0 || (size_t )len >= remaining) goto err; p += len;@@ -179,7 +185,7 @@ retry:continue ; } -if (xperms->specified &AVTAB_XPERMS_IOCTLFUNCTION ) { +if (xperms->specified ==AVTAB_XPERMS_IOCTLFUNCTION || xperms->specified ==AVTAB_XPERMS_NLMSG ) { value = xperms->driver<<8 | bit;if (in_range) { low_value = xperms->driver<<8 | low_bit;@@ -187,7 +193,7 @@ retry: }else { len =snprintf (p, remaining,"0x%hx " , value); } - }else if (xperms->specified &AVTAB_XPERMS_IOCTLDRIVER ) { + }else if (xperms->specified ==AVTAB_XPERMS_IOCTLDRIVER ) { value = bit <<8 ;if (in_range) { low_value = low_bit <<8 ; --2.46.0.184.g6999bdac58-goog
Re: [PATCH 3/3] libsepol: Add policy capability netlink_xperm
In reply to Thiébaud WeksteenQuoted 5 lines · Thiébaud Weksteen
This capability can be enabled to change the kernel's behaviour and use the extended permissions for netlink messages.
Signed-off-by Thiébaud Weksteen <[email protected]>
Quoted 32 lines
--- libsepol/include/sepol/policydb/polcaps.h | 1 + libsepol/src/polcaps.c | 1 + 2 files changed, 2 insertions(+)libsepol/include/sepol/policydb/polcaps.h +1
-0@@ -16,6 +16,7 @@ enum {POLICYDB_CAP_GENFS_SECLABEL_SYMLINKS ,POLICYDB_CAP_IOCTL_SKIP_CLOEXEC ,POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT , +POLICYDB_CAP_NETLINK_XPERM , __POLICYDB_CAP_MAX };#define POLICYDB_CAP_MAX (__POLICYDB_CAP_MAX - 1)libsepol/src/polcaps.c +1
-1@@ -15,6 +15,7 @@ static const char * const polcap_names[POLICYDB_CAP_MAX + 1] = { [POLICYDB_CAP_GENFS_SECLABEL_SYMLINKS] = "genfs_seclabel_symlinks", [POLICYDB_CAP_IOCTL_SKIP_CLOEXEC] = "ioctl_skip_cloexec", [POLICYDB_CAP_USERSPACE_INITIAL_CONTEXT] = "userspace_initial_context", + [POLICYDB_CAP_NETLINK_XPERM] = "netlink_xperm", };int sepol_polcap_getnum (const char *name) --2.46.0.184.g6999bdac58-goog
Quoted 11 lines · Stephen Smalley
Quoted 6 lines · Thiébaud Weksteen
The ioctl extended permission structures and functions can be reused for other extended permissions. Use the more generic term "xperm" instead of "ioctl".
Signed-off-by Thiébaud Weksteen <[email protected]>Acked-by Stephen Smalley <[email protected]>
These three patches have been merged.
Jim
Quoted 213 lines
Quoted 212 lines
--- checkpolicy/policy_define.c | 72 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-)checkpolicy/policy_define.c +36
-37@@ -1874,27 +1874,27 @@ avrule_t *define_cond_pol_list(avrule_t * avlist, avrule_t * sl)return sl; } -typedef struct av_ioctl_range { +typedef struct av_xperm_range {uint16_t low;uint16_t high; -}av_ioctl_range_t ; +}av_xperm_range_t ; -struct av_ioctl_range_list { +struct av_xperm_range_list {uint8_t omit; -av_ioctl_range_t range; -struct av_ioctl_range_list *next; +av_xperm_range_t range; +struct av_xperm_range_list *next; }; -static int avrule_sort_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_sort_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *r, *r2, *sorted, *sortedhead =NULL ; +struct av_xperm_range_list *r, *r2, *sorted, *sortedhead =NULL ;/* order list by range.low */ for (r = *rangehead; r !=NULL ; r = r->next) { - sorted =malloc (sizeof (struct av_ioctl_range_list )); + sorted =malloc (sizeof (struct av_xperm_range_list ));if (sorted ==NULL ) goto error; -memcpy (sorted, r,sizeof (struct av_ioctl_range_list )); +memcpy (sorted, r,sizeof (struct av_xperm_range_list )); sorted->next =NULL ;if (sortedhead ==NULL ) { sortedhead = sorted;@@ -1933,9 +1933,9 @@ error:return -1 ; } -static void avrule_merge_ioctls (struct av_ioctl_range_list **rangehead) +static void avrule_merge_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *r, *tmp; +struct av_xperm_range_list *r, *tmp; r = *rangehead;while (r !=NULL && r->next !=NULL ) {/* merge */ @@ -1952,15 +1952,15 @@ static void avrule_merge_ioctls(struct av_ioctl_range_list **rangehead) } } -static int avrule_read_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_read_xperm_ranges (struct av_xperm_range_list **rangehead) {char *id; -struct av_ioctl_range_list *rnew, *r =NULL ; +struct av_xperm_range_list *rnew, *r =NULL ;uint8_t omit =0 ; *rangehead =NULL ; -/* read in all the ioctl commands */ +/* read in all the ioctl/netlink commands */ while ((id =queue_remove (id_queue))) {if (strcmp (id,"~" ) ==0 ) {/* these are values to be omitted */ @@ -1979,7 +1979,7 @@ static int avrule_read_ioctls(struct av_ioctl_range_list **rangehead)free (id); }else {/* read in new low value */ - rnew =malloc (sizeof (struct av_ioctl_range_list )); + rnew =malloc (sizeof (struct av_xperm_range_list ));if (rnew ==NULL ) goto error; rnew->next =NULL ;@@ -2006,11 +2006,11 @@ error: }/* flip to included ranges */ -static int avrule_omit_ioctls (struct av_ioctl_range_list **rangehead) +static int avrule_omit_xperms (struct av_xperm_range_list **rangehead) { -struct av_ioctl_range_list *rnew, *r, *newhead, *r2; +struct av_xperm_range_list *rnew, *r, *newhead, *r2; - rnew =calloc (1 ,sizeof (struct av_ioctl_range_list )); + rnew =calloc (1 ,sizeof (struct av_xperm_range_list ));if (!rnew) goto error;@@ -2028,7 +2028,7 @@ static int avrule_omit_ioctls(struct av_ioctl_range_list **rangehead)while (r) { r2->range.high = r->range.low -1 ; - rnew =calloc (1 ,sizeof (struct av_ioctl_range_list )); + rnew =calloc (1 ,sizeof (struct av_xperm_range_list ));if (!rnew) goto error; r2->next = rnew;@@ -2054,26 +2054,26 @@ error:return -1 ; } -static int avrule_ioctl_ranges (struct av_ioctl_range_list **rangelist) +static int avrule_xperm_ranges (struct av_xperm_range_list **rangelist) { -struct av_ioctl_range_list *rangehead; +struct av_xperm_range_list *rangehead;uint8_t omit;/* read in ranges to include and omit */ -if (avrule_read_ioctls (&rangehead)) +if (avrule_read_xperm_ranges (&rangehead))return -1 ;if (rangehead ==NULL ) { -yyerror ("error processing ioctl commands" ); +yyerror ("error processing ioctl/netlink commands" );return -1 ; } omit = rangehead->omit; -/* sort and merge the input ioctls */ -if (avrule_sort_ioctls (&rangehead)) +/* sort and merge the input ranges */ +if (avrule_sort_xperms (&rangehead))return -1 ; -avrule_merge_ioctls (&rangehead); +avrule_merge_xperms (&rangehead);/* flip ranges if these are omitted */ if (omit) { -if (avrule_omit_ioctls (&rangehead)) +if (avrule_omit_xperms (&rangehead))return -1 ; }@@ -2261,11 +2261,11 @@ static int avrule_xperms_used(const av_extended_perms_t *xperms)#define IOC_DRIV (x) ((x) >> 8)#define IOC_FUNC (x) ((x) & 0xff)#define IOC_CMD (driver, func) (((driver) << 8) + (func)) -static int avrule_ioctl_partialdriver (struct av_ioctl_range_list *rangelist, +static int avrule_xperm_partialdriver (struct av_xperm_range_list *rangelist,av_extended_perms_t *complete_driver,av_extended_perms_t **extended_perms) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint8_t low, high;@@ -2300,10 +2300,10 @@ static int avrule_ioctl_partialdriver(struct av_ioctl_range_list *rangelist, } -static int avrule_ioctl_completedriver (struct av_ioctl_range_list *rangelist, +static int avrule_ioctl_completedriver (struct av_xperm_range_list *rangelist,av_extended_perms_t **extended_perms) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint16_t low, high; xperms =calloc (1 ,sizeof (av_extended_perms_t));@@ -2342,10 +2342,10 @@ static int avrule_ioctl_completedriver(struct av_ioctl_range_list *rangelist,return 0 ; } -static int avrule_ioctl_func (struct av_ioctl_range_list *rangelist, +static int avrule_ioctl_func (struct av_xperm_range_list *rangelist,av_extended_perms_t **extended_perms,unsigned int driver) { -struct av_ioctl_range_list *r; +struct av_xperm_range_list *r;av_extended_perms_t *xperms;uint16_t low, high;@@ -2457,13 +2457,13 @@ static int avrule_cpy(avrule_t *dest, const avrule_t *src)static int define_te_avtab_ioctl (const avrule_t *avrule_template) {avrule_t *avrule; -struct av_ioctl_range_list *rangelist, *r; +struct av_xperm_range_list *rangelist, *r;av_extended_perms_t *complete_driver, *partial_driver, *xperms;unsigned int i;/* organize ioctl ranges */ -if (avrule_ioctl_ranges (&rangelist)) +if (avrule_xperm_ranges (&rangelist))return -1 ;/* create rule for ioctl driver types that are entirely enabled */ @@ -2482,7 +2482,7 @@ static int define_te_avtab_ioctl(const avrule_t *avrule_template) }/* flag ioctl driver codes that are partially enabled */ -if (avrule_ioctl_partialdriver (rangelist, complete_driver, &partial_driver)) +if (avrule_xperm_partialdriver (rangelist, complete_driver, &partial_driver))return -1 ;if (!partial_driver || !avrule_xperms_used (partial_driver)) --2.46.0.184.g6999bdac58-goog