libsepol/cil: Provide option to allow qualified names in declarations
PATCH v2 1/4 libsepol/cil: Provide option to allow qualified names in declarations
Qualified names have "dots" in them. They are generated when a CIL policy is compiled and come from declarations in blocks. If a kernel policy is decompiled into a CIL policy, the resulting policy could have declarations that use qualified names. Compiling this policy would result in an error because "dots" in declarations are not allowed.
Qualified names in a policy are normally used to refer to the name of identifiers, blocks, macros, or optionals that are declared in a different block (that is not a parent). Name resolution is based on splitting a name based on the "dots", searching the parents up to the global namespace for the first block using the first part of the name, using the second part of the name to lookup the next block using the first block's symbol tables, looking up the third block in the second's symbol tables, and so on.
To allow the option of using qualified names in declarations:
1) Create a field in the struct cil_db called "qualified_names" which is set to CIL_TRUE when qualified names are to be used. This field is checked in cil_verify_name() and "dots" are allowed if qualified names are being allowed.
2) Only allow the direct lookup of the whole name in the global symbol table. This means that blocks, blockinherits, blockabstracts, and in- statements cannot be allowed. Use the "qualified_names" field of the cil_db to know when using one of these should result in an error.
3) Create the function cil_set_qualified_names() that is used to set the "qualified_names" field. Export the function in libsepol.
---
v2:
Fixed misspelling in commit message
Make struct cil_db * const in cil_verify_name()
libsepol/cil/include/cil/cil.h | 1 + libsepol/cil/src/cil.c | 6 ++++++ libsepol/cil/src/cil_build_ast.c | 24 ++++++++++++++++++++++-- libsepol/cil/src/cil_internal.h | 1 + libsepol/cil/src/cil_resolve_ast.c | 4 ++-- libsepol/cil/src/cil_verify.c | 19 ++++++++++++++----- libsepol/cil/src/cil_verify.h | 2 +- libsepol/src/libsepol.map.in | 1 + 8 files changed, 48 insertions(+), 10 deletions(-)
libsepol/cil/include/cil/cil.h +1 -0
@@ -51,6 +51,7 @@ extern int cil_selinuxusers_to_string(cil_db_t *db, char **out, size_t *size);extern int cil_filecons_to_string (cil_db_t *db,char **out,size_t *size);extern void cil_set_disable_dontaudit (cil_db_t *db,int disable_dontaudit);extern void cil_set_multiple_decls (cil_db_t *db,int multiple_decls); +extern void cil_set_qualified_names (struct cil_db *db,int qualified_names);extern void cil_set_disable_neverallow (cil_db_t *db,int disable_neverallow);extern void cil_set_preserve_tunables (cil_db_t *db,int preserve_tunables);extern int cil_set_handle_unknown (cil_db_t *db,int handle_unknown);
libsepol/cil/src/cil.c +6 -0
@@ -440,6 +440,7 @@ void cil_db_init(struct cil_db **db) (*db)->handle_unknown =-1 ; (*db)->mls =-1 ; (*db)->multiple_decls =CIL_FALSE ; + (*db)->qualified_names =CIL_FALSE ; (*db)->target_platform =SEPOL_TARGET_SELINUX ; (*db)->policy_version =POLICYDB_VERSION_MAX ; }
@@ -1872,6 +1873,11 @@ void cil_set_multiple_decls(struct cil_db *db, int multiple_decls) db->multiple_decls = multiple_decls; } +void cil_set_qualified_names (struct cil_db *db,int qualified_names) +{ + db->qualified_names = qualified_names; +} +void cil_set_target_platform (struct cil_db *db,int target_platform) { db->target_platform = target_platform;
libsepol/cil/src/cil_build_ast.c +22 -2
@@ -146,7 +146,7 @@ int cil_gen_node(struct cil_db *db, struct cil_tree_node *ast_node, struct cil_sint rc =SEPOL_ERR ;symtab_t *symtab =NULL ; - rc =cil_verify_name ((const char *)key, nflavor); + rc =cil_verify_name (db, (const char *)key, nflavor);if (rc !=SEPOL_OK ) { goto exit; }
@@ -204,6 +204,11 @@ int cil_gen_block(struct cil_db *db, struct cil_tree_node *parse_current, struct goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Blocks are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;
@@ -274,6 +279,11 @@ int cil_gen_blockinherit(struct cil_db *db, struct cil_tree_node *parse_current, goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Block inherit rules are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;
@@ -331,6 +341,11 @@ int cil_gen_blockabstract(struct cil_db *db, struct cil_tree_node *parse_current goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Block abstract rules are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;
@@ -376,6 +391,11 @@ int cil_gen_in(struct cil_db *db, struct cil_tree_node *parse_current, struct ci goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"In-statements are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;
@@ -5261,7 +5281,7 @@ int cil_gen_macro(struct cil_db *db, struct cil_tree_node *parse_current, struct param->str = current_item->cl_head->next->data; - rc =cil_verify_name (param->str, param->flavor); + rc =cil_verify_name (db, param->str, param->flavor);if (rc !=SEPOL_OK ) {cil_destroy_param (param); goto exit;
libsepol/cil/src/cil_internal.h +1 -0
@@ -321,6 +321,7 @@ struct cil_db {int handle_unknown;int mls;int multiple_decls; +int qualified_names;int target_platform;int policy_version; };
libsepol/cil/src/cil_resolve_ast.c +2 -2
@@ -4409,8 +4409,8 @@ int cil_resolve_name_keep_aliases(struct cil_tree_node *ast_node, char *name, en *datum =NULL ; -if (strchr (name,'.' ) ==NULL ) { -/* No '.' in name */ +if (db->qualified_names ||strchr (name,'.' ) ==NULL ) { +/* Using qualified names or No '.' in name */ rc =__cil_resolve_name_helper (db, ast_node->parent, name, sym_index, datum);if (rc !=SEPOL_OK ) { goto exit;
libsepol/cil/src/cil_verify.c +14 -5
@@ -92,7 +92,7 @@ static int __cil_is_reserved_name(const char *name, enum cil_flavor flavor)return CIL_FALSE ; } -int cil_verify_name (const char *name,enum cil_flavor flavor) +int cil_verify_name (const struct cil_db *db,const char *name,enum cil_flavor flavor) {int rc =SEPOL_ERR ;int len;
@@ -116,10 +116,19 @@ int cil_verify_name(const char *name, enum cil_flavor flavor) goto exit; } -for (i =1 ; i < len; i++) { -if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' ) { -cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); - goto exit; +if (db->qualified_names ==CIL_FALSE ) { +for (i =1 ; i < len; i++) { +if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' ) { +cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); + goto exit; + } + } + }else { +for (i =1 ; i < len; i++) { +if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' && name[i] !='.' ) { +cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); + goto exit; + } } }
libsepol/cil/src/cil_verify.h +1 -1
@@ -56,7 +56,7 @@ struct cil_args_verify {int *pass; }; -int cil_verify_name (const char *name,enum cil_flavor flavor); +int cil_verify_name (const struct cil_db *db,const char *name,enum cil_flavor flavor);int __cil_verify_syntax (struct cil_tree_node *parse_current,enum cil_syntax s[],int len);int cil_verify_expr_syntax (struct cil_tree_node *current,enum cil_flavor op,enum cil_flavor expr_flavor);int cil_verify_constraint_leaf_expr_syntax (enum cil_flavor l_flavor,enum cil_flavor r_flavor,enum cil_flavor op,enum cil_flavor expr_flavor);
libsepol/src/libsepol.map.in +1 -0
@@ -272,4 +272,5 @@ LIBSEPOL_3.0 { cil_write_parse_ast; cil_write_build_ast; cil_write_resolve_ast; + cil_set_qualified_names; } LIBSEPOL_1.1;
Signature · 1 line
2.31.1
PATCH v2 2/4 secilc: Add support for using qualified names to secilc
Provide the option "-Q" or "--qualified-names" to indicate that the policy is using qualified names.
Using qualified names means that declaration names can have "dots" in them, but blocks, blockinherits, blockabstracts, and in-statements are not allowed in the policy.
The libsepol function cil_set_qualified_names() is called with the desired value for the CIL db's "qualified_names" field.
---
v2:
Changed the language for the man page and "--help" documentation
secilc/secilc.8.xml | 5 +++++ secilc/secilc.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
secilc/secilc.8.xml +5 -0
@@ -75,6 +75,11 @@ <listitem><para>Treat tunables as booleans.</para></listitem> </varlistentry> + <varlistentry> + <term><option>-Q, --qualified-names</option></term> + <listitem><para>Allow names containing dots (qualified names). Blocks, blockinherits, blockabstracts, and in-statements will not be allowed.</para></listitem> + </varlistentry> + <varlistentry> <term><option>-m, --multiple-decls</option></term> <listitem><para>Allow some statements to be re-declared.</para></listitem>
secilc/secilc.c +10 -1
@@ -63,6 +63,9 @@ static __attribute__((__noreturn__)) void usage(const char *prog)printf (" statement if present in the policy\n" );printf (" -D, --disable-dontaudit do not add dontaudit rules to the binary policy\n" );printf (" -P, --preserve-tunables treat tunables as booleans\n" ); +printf (" -Q, --qualified-names Allow names containing dots (qualified names).\n" ); +printf (" Blocks, blockinherits, blockabstracts, and\n" ); +printf (" in-statements will not be allowed.\n" );printf (" -m, --multiple-decls allow some statements to be re-declared\n" );printf (" -N, --disable-neverallow do not check neverallow rules\n" );printf (" -G, --expand-generated Expand and remove auto-generated attributes\n" );
@@ -94,6 +97,7 @@ int main(int argc, char *argv[])int multiple_decls =0 ;int disable_neverallow =0 ;int preserve_tunables =0 ; +int qualified_names =0 ;int handle_unknown =-1 ;int policyvers =POLICYDB_VERSION_MAX ;int attrs_expand_generated =0 ;
@@ -115,6 +119,7 @@ int main(int argc, char *argv[]) {"multiple-decls", no_argument, 0, 'm'}, {"disable-neverallow", no_argument, 0, 'N'}, {"preserve-tunables", no_argument, 0, 'P'}, + {"qualified-names", no_argument, 0, 'Q'}, {"output", required_argument, 0, 'o'}, {"filecontexts", required_argument, 0, 'f'}, {"expand-generated", no_argument, 0, 'G'},
@@ -125,7 +130,7 @@ int main(int argc, char *argv[])int i;while (1 ) { - opt_char =getopt_long (argc, argv,"o:f:U:hvt:M:PDmNOc:GX:n" , long_opts, &opt_index); + opt_char =getopt_long (argc, argv,"o:f:U:hvt:M:PQDmNOc:GX:n" , long_opts, &opt_index);if (opt_char ==-1 ) {break ; }
@@ -190,6 +195,9 @@ int main(int argc, char *argv[])case 'P' : preserve_tunables =1 ;break ; +case 'Q' : + qualified_names =1 ; +break ;case 'o' : output =strdup (optarg);break ;
@@ -238,6 +246,7 @@ int main(int argc, char *argv[])cil_set_multiple_decls (db, multiple_decls);cil_set_disable_neverallow (db, disable_neverallow);cil_set_preserve_tunables (db, preserve_tunables); +cil_set_qualified_names (db, qualified_names);if (handle_unknown !=-1 ) { rc =cil_set_handle_unknown (db, handle_unknown);if (rc !=SEPOL_OK ) {
Signature · 1 line
2.31.1
PATCH v2 3/4 libsepol/cil: Add support for using qualified names to secil2tree
In reply to James CarterProvide the option "-Q" or "--qualified-names" to indicate that the policy is using qualified names.
Using qualified names means that declaration names can have "dots" in them, but blocks, blockinherits, blockabstracts, and in-statements are not allowed in the policy.
The libsepol function cil_set_qualified_names() is called with the desired value for the CIL db's "qualified_names" field.
---
v2:
Changed the language for the man page and "--help" documentation
secilc/secil2tree.8.xml | 5 +++++ secilc/secil2tree.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
secilc/secil2tree.8.xml +5 -0
@@ -45,6 +45,11 @@ <listitem><para>Treat tunables as booleans.</para></listitem> </varlistentry> + <varlistentry> + <term><option>-Q, --qualified-names</option></term> + <listitem><para>Allow names containing dots (qualified names). Blocks, blockinherits, blockabstracts, and in-statements will not be allowed.</para></listitem> + </varlistentry> + <varlistentry> <term><option>-A, --ast-phase=<phase></option></term> <listitem><para>Write AST of phase <emphasis role="italic">phase</emphasis>. Must be <emphasis role="bold">parse</emphasis>, <emphasis role="bold">build</emphasis>, or <emphasis role="bold">resolve</emphasis>. (default: <emphasis role="bold">resolve</emphasis>)</para></listitem>
secilc/secil2tree.c +10 -1
@@ -54,6 +54,9 @@ static __attribute__((__noreturn__)) void usage(const char *prog)printf ("Options:\n" );printf (" -o, --output=<file> write AST to <file>. (default: stdout)\n" );printf (" -P, --preserve-tunables treat tunables as booleans\n" ); +printf (" -Q, --qualified-names Allow names containing dots (qualified names).\n" ); +printf (" Blocks, blockinherits, blockabstracts, and\n" ); +printf (" in-statements will not be allowed.\n" );printf (" -A, --ast-phase=<phase> write AST of phase <phase>. Phase must be parse, \n" );printf (" build, or resolve. (default: resolve)\n" );printf (" -v, --verbose increment verbosity level\n" );
@@ -71,6 +74,7 @@ int main(int argc, char *argv[])char *output =NULL ;struct cil_db *db =NULL ;int preserve_tunables =0 ; +int qualified_names =0 ;enum write_ast_phase write_ast =WRITE_AST_PHASE_RESOLVE ;int opt_char;int opt_index =0 ;
@@ -79,6 +83,7 @@ int main(int argc, char *argv[]) {"help", no_argument, 0, 'h'}, {"verbose", no_argument, 0, 'v'}, {"preserve-tunables", no_argument, 0, 'P'}, + {"qualified-names", no_argument, 0, 'Q'}, {"output", required_argument, 0, 'o'}, {"ast-phase", required_argument, 0, 'A'}, {0, 0, 0, 0}
@@ -86,7 +91,7 @@ int main(int argc, char *argv[])int i;while (1 ) { - opt_char =getopt_long (argc, argv,"o:hvPA:" , long_opts, &opt_index); + opt_char =getopt_long (argc, argv,"o:hvPQA:" , long_opts, &opt_index);if (opt_char ==-1 ) {break ; }
@@ -97,6 +102,9 @@ int main(int argc, char *argv[])case 'P' : preserve_tunables =1 ;break ; +case 'Q' : + qualified_names =1 ; +break ;case 'o' : output =strdup (optarg);break ;
@@ -131,6 +139,7 @@ int main(int argc, char *argv[])cil_db_init (&db);cil_set_preserve_tunables (db, preserve_tunables); +cil_set_qualified_names (db, qualified_names);cil_set_attrs_expand_generated (db,0 );cil_set_attrs_expand_size (db,0 );
Signature · 1 line
2.31.1
PATCH v2 4/4 libsepol/cil: Add support for using qualified names to secil2conf
In reply to James CarterProvide the option "-Q" or "--qualified-names" to indicate that the policy is using qualified names.
Using qualified names means that declaration names can have "dots" in them, but blocks, blockinherits, blockabstracts, and in-statements are not allowed in the policy.
The libsepol function cil_set_qualified_names() is called with the desired value for the CIL db's "qualified_names" field.
---
v2:
Changed the language for the man page and "--help" documentation
secilc/secil2conf.8.xml | 5 +++++ secilc/secil2conf.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
secilc/secil2conf.8.xml +5 -0
@@ -50,6 +50,11 @@ <listitem><para>Treat tunables as booleans.</para></listitem> </varlistentry> + <varlistentry> + <term><option>-Q, --qualified-names</option></term> + <listitem><para>Allow names containing dots (qualified names). Blocks, blockinherits, blockabstracts, and in-statements will not be allowed.</para></listitem> + </varlistentry> + <varlistentry> <term><option>-v, --verbose</option></term> <listitem><para>Increment verbosity level.</para></listitem>
secilc/secil2conf.c +10 -1
@@ -52,6 +52,9 @@ static __attribute__((__noreturn__)) void usage(const char *prog)printf (" This will override the (mls boolean) statement\n" );printf (" if present in the policy\n" );printf (" -P, --preserve-tunables treat tunables as booleans\n" ); +printf (" -Q, --qualified-names Allow names containing dots (qualified names).\n" ); +printf (" Blocks, blockinherits, blockabstracts, and\n" ); +printf (" in-statements will not be allowed.\n" );printf (" -v, --verbose increment verbosity level\n" );printf (" -h, --help display usage information\n" );exit (1 );
@@ -68,6 +71,7 @@ int main(int argc, char *argv[])struct cil_db *db =NULL ;int mls =-1 ;int preserve_tunables =0 ; +int qualified_names =0 ;int opt_char;int opt_index =0 ;enum cil_log_level log_level =CIL_ERR ;
@@ -76,13 +80,14 @@ int main(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"mls", required_argument, 0, 'M'}, {"preserve-tunables", no_argument, 0, 'P'}, + {"qualified-names", no_argument, 0, 'Q'}, {"output", required_argument, 0, 'o'}, {0, 0, 0, 0} };int i;while (1 ) { - opt_char =getopt_long (argc, argv,"o:hvM:P" , long_opts, &opt_index); + opt_char =getopt_long (argc, argv,"o:hvM:PQ" , long_opts, &opt_index);if (opt_char ==-1 ) {break ; }
@@ -102,6 +107,9 @@ int main(int argc, char *argv[])case 'P' : preserve_tunables =1 ;break ; +case 'Q' : + qualified_names =1 ; +break ;case 'o' : output =strdup (optarg);break ;
@@ -123,6 +131,7 @@ int main(int argc, char *argv[])cil_db_init (&db);cil_set_preserve_tunables (db, preserve_tunables); +cil_set_qualified_names (db, qualified_names);cil_set_mls (db, mls);cil_set_attrs_expand_generated (db,0 );cil_set_attrs_expand_size (db,0 );
Signature · 1 line
2.31.1
Quoted 28 lines · James Carter
Qualified names have "dots" in them. They are generated when a CIL policy is compiled and come from declarations in blocks. If a kernel policy is decompiled into a CIL policy, the resulting policy could have declarations that use qualified names. Compiling this policy would result in an error because "dots" in declarations are not allowed.
Qualified names in a policy are normally used to refer to the name of identifiers, blocks, macros, or optionals that are declared in a different block (that is not a parent). Name resolution is based on splitting a name based on the "dots", searching the parents up to the global namespace for the first block using the first part of the name, using the second part of the name to lookup the next block using the first block's symbol tables, looking up the third block in the second's symbol tables, and so on.
To allow the option of using qualified names in declarations:
1) Create a field in the struct
cil_dbcalled "qualified_names" which is set toCIL_TRUEwhen qualified names are to be used. This field is checked incil_verify_name()and "dots" are allowed if qualified names are being allowed.2) Only allow the direct lookup of the whole name in the global symbol table. This means that blocks, blockinherits, blockabstracts, and in- statements cannot be allowed. Use the "
qualified_names" field of thecil_dbto know when using one of these should result in an error.
Quoted 8 lines
3) Create the function
cil_set_qualified_names()that is used to set the "qualified_names" field. Export the function in libsepol.Signed-off-by James Carter <[email protected]>---
v2:
Fixed misspelling in commit message
Make structcil_db* const incil_verify_name()
For these 4 patches:
Thanks,
Nicolas
Quoted 207 lines
libsepol/cil/include/cil/cil.h | 1 + libsepol/cil/src/cil.c | 6 ++++++ libsepol/cil/src/cil_build_ast.c | 24 ++++++++++++++++++++++-- libsepol/cil/src/cil_internal.h | 1 + libsepol/cil/src/cil_resolve_ast.c | 4 ++-- libsepol/cil/src/cil_verify.c | 19 ++++++++++++++----- libsepol/cil/src/cil_verify.h | 2 +- libsepol/src/libsepol.map.in | 1 + 8 files changed, 48 insertions(+), 10 deletions(-)libsepol/cil/include/cil/cil.h +1
-0@@ -51,6 +51,7 @@ extern int cil_selinuxusers_to_string(cil_db_t *db, char **out, size_t *size);extern int cil_filecons_to_string (cil_db_t *db,char **out,size_t *size);extern void cil_set_disable_dontaudit (cil_db_t *db,int disable_dontaudit);extern void cil_set_multiple_decls (cil_db_t *db,int multiple_decls); +extern void cil_set_qualified_names (struct cil_db *db,int qualified_names);extern void cil_set_disable_neverallow (cil_db_t *db,int disable_neverallow);extern void cil_set_preserve_tunables (cil_db_t *db,int preserve_tunables);extern int cil_set_handle_unknown (cil_db_t *db,int handle_unknown);libsepol/cil/src/cil.c +6
-0@@ -440,6 +440,7 @@ void cil_db_init(struct cil_db **db) (*db)->handle_unknown =-1 ; (*db)->mls =-1 ; (*db)->multiple_decls =CIL_FALSE ; + (*db)->qualified_names =CIL_FALSE ; (*db)->target_platform =SEPOL_TARGET_SELINUX ; (*db)->policy_version =POLICYDB_VERSION_MAX ; }@@ -1872,6 +1873,11 @@ void cil_set_multiple_decls(struct cil_db *db, int multiple_decls) db->multiple_decls = multiple_decls; } +void cil_set_qualified_names (struct cil_db *db,int qualified_names) +{ + db->qualified_names = qualified_names; +} +void cil_set_target_platform (struct cil_db *db,int target_platform) { db->target_platform = target_platform;libsepol/cil/src/cil_build_ast.c +22
-2@@ -146,7 +146,7 @@ int cil_gen_node(struct cil_db *db, struct cil_tree_node *ast_node, struct cil_sint rc =SEPOL_ERR ;symtab_t *symtab =NULL ; - rc =cil_verify_name ((const char *)key, nflavor); + rc =cil_verify_name (db, (const char *)key, nflavor);if (rc !=SEPOL_OK ) { goto exit; }@@ -204,6 +204,11 @@ int cil_gen_block(struct cil_db *db, struct cil_tree_node *parse_current, struct goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Blocks are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -274,6 +279,11 @@ int cil_gen_blockinherit(struct cil_db *db, struct cil_tree_node *parse_current, goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Block inherit rules are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -331,6 +341,11 @@ int cil_gen_blockabstract(struct cil_db *db, struct cil_tree_node *parse_current goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Block abstract rules are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -376,6 +391,11 @@ int cil_gen_in(struct cil_db *db, struct cil_tree_node *parse_current, struct ci goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"In-statements are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -5261,7 +5281,7 @@ int cil_gen_macro(struct cil_db *db, struct cil_tree_node *parse_current, struct param->str = current_item->cl_head->next->data; - rc =cil_verify_name (param->str, param->flavor); + rc =cil_verify_name (db, param->str, param->flavor);if (rc !=SEPOL_OK ) {cil_destroy_param (param); goto exit;libsepol/cil/src/cil_internal.h +1
-0@@ -321,6 +321,7 @@ struct cil_db {int handle_unknown;int mls;int multiple_decls; +int qualified_names;int target_platform;int policy_version; };libsepol/cil/src/cil_resolve_ast.c +2
-2@@ -4409,8 +4409,8 @@ int cil_resolve_name_keep_aliases(struct cil_tree_node *ast_node, char *name, en *datum =NULL ; -if (strchr (name,'.' ) ==NULL ) { -/* No '.' in name */ +if (db->qualified_names ||strchr (name,'.' ) ==NULL ) { +/* Using qualified names or No '.' in name */ rc =__cil_resolve_name_helper (db, ast_node->parent, name, sym_index, datum);if (rc !=SEPOL_OK ) { goto exit;libsepol/cil/src/cil_verify.c +14
-5@@ -92,7 +92,7 @@ static int __cil_is_reserved_name(const char *name, enum cil_flavor flavor)return CIL_FALSE ; } -int cil_verify_name (const char *name,enum cil_flavor flavor) +int cil_verify_name (const struct cil_db *db,const char *name,enum cil_flavor flavor) {int rc =SEPOL_ERR ;int len;@@ -116,10 +116,19 @@ int cil_verify_name(const char *name, enum cil_flavor flavor) goto exit; } -for (i =1 ; i < len; i++) { -if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' ) { -cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); - goto exit; +if (db->qualified_names ==CIL_FALSE ) { +for (i =1 ; i < len; i++) { +if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' ) { +cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); + goto exit; + } + } + }else { +for (i =1 ; i < len; i++) { +if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' && name[i] !='.' ) { +cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); + goto exit; + } } }libsepol/cil/src/cil_verify.h +1
-1@@ -56,7 +56,7 @@ struct cil_args_verify {int *pass; }; -int cil_verify_name (const char *name,enum cil_flavor flavor); +int cil_verify_name (const struct cil_db *db,const char *name,enum cil_flavor flavor);int __cil_verify_syntax (struct cil_tree_node *parse_current,enum cil_syntax s[],int len);int cil_verify_expr_syntax (struct cil_tree_node *current,enum cil_flavor op,enum cil_flavor expr_flavor);int cil_verify_constraint_leaf_expr_syntax (enum cil_flavor l_flavor,enum cil_flavor r_flavor,enum cil_flavor op,enum cil_flavor expr_flavor);libsepol/src/libsepol.map.in +1
-1@@ -272,4 +272,5 @@ LIBSEPOL_3.0 { cil_write_parse_ast; cil_write_build_ast; cil_write_resolve_ast; + cil_set_qualified_names; } LIBSEPOL_1.1; --2.31.1
Nicolas Iooss
AppliedQuoted 39 lines · Nicolas Iooss
Quoted 28 lines · James Carter
Qualified names have "dots" in them. They are generated when a CIL policy is compiled and come from declarations in blocks. If a kernel policy is decompiled into a CIL policy, the resulting policy could have declarations that use qualified names. Compiling this policy would result in an error because "dots" in declarations are not allowed.
Qualified names in a policy are normally used to refer to the name of identifiers, blocks, macros, or optionals that are declared in a different block (that is not a parent). Name resolution is based on splitting a name based on the "dots", searching the parents up to the global namespace for the first block using the first part of the name, using the second part of the name to lookup the next block using the first block's symbol tables, looking up the third block in the second's symbol tables, and so on.
To allow the option of using qualified names in declarations:
1) Create a field in the struct
cil_dbcalled "qualified_names" which is set toCIL_TRUEwhen qualified names are to be used. This field is checked incil_verify_name()and "dots" are allowed if qualified names are being allowed.2) Only allow the direct lookup of the whole name in the global symbol table. This means that blocks, blockinherits, blockabstracts, and in- statements cannot be allowed. Use the "
qualified_names" field of thecil_dbto know when using one of these should result in an error.Quoted 8 lines
3) Create the function
cil_set_qualified_names()that is used to set the "qualified_names" field. Export the function in libsepol.Signed-off-by James Carter <[email protected]>---
v2:
Fixed misspelling in commit message
Make structcil_db* const incil_verify_name()
Quoted 3 lines
For these 4 patches:
Acked-by Nicolas Iooss <[email protected]>
Applied.
Thanks,
Nicolas
Quoted 207 lines
Quoted 207 lines
libsepol/cil/include/cil/cil.h | 1 + libsepol/cil/src/cil.c | 6 ++++++ libsepol/cil/src/cil_build_ast.c | 24 ++++++++++++++++++++++-- libsepol/cil/src/cil_internal.h | 1 + libsepol/cil/src/cil_resolve_ast.c | 4 ++-- libsepol/cil/src/cil_verify.c | 19 ++++++++++++++----- libsepol/cil/src/cil_verify.h | 2 +- libsepol/src/libsepol.map.in | 1 + 8 files changed, 48 insertions(+), 10 deletions(-)libsepol/cil/include/cil/cil.h +1
-0@@ -51,6 +51,7 @@ extern int cil_selinuxusers_to_string(cil_db_t *db, char **out, size_t *size);extern int cil_filecons_to_string (cil_db_t *db,char **out,size_t *size);extern void cil_set_disable_dontaudit (cil_db_t *db,int disable_dontaudit);extern void cil_set_multiple_decls (cil_db_t *db,int multiple_decls); +extern void cil_set_qualified_names (struct cil_db *db,int qualified_names);extern void cil_set_disable_neverallow (cil_db_t *db,int disable_neverallow);extern void cil_set_preserve_tunables (cil_db_t *db,int preserve_tunables);extern int cil_set_handle_unknown (cil_db_t *db,int handle_unknown);libsepol/cil/src/cil.c +6
-0@@ -440,6 +440,7 @@ void cil_db_init(struct cil_db **db) (*db)->handle_unknown =-1 ; (*db)->mls =-1 ; (*db)->multiple_decls =CIL_FALSE ; + (*db)->qualified_names =CIL_FALSE ; (*db)->target_platform =SEPOL_TARGET_SELINUX ; (*db)->policy_version =POLICYDB_VERSION_MAX ; }@@ -1872,6 +1873,11 @@ void cil_set_multiple_decls(struct cil_db *db, int multiple_decls) db->multiple_decls = multiple_decls; } +void cil_set_qualified_names (struct cil_db *db,int qualified_names) +{ + db->qualified_names = qualified_names; +} +void cil_set_target_platform (struct cil_db *db,int target_platform) { db->target_platform = target_platform;libsepol/cil/src/cil_build_ast.c +22
-2@@ -146,7 +146,7 @@ int cil_gen_node(struct cil_db *db, struct cil_tree_node *ast_node, struct cil_sint rc =SEPOL_ERR ;symtab_t *symtab =NULL ; - rc =cil_verify_name ((const char *)key, nflavor); + rc =cil_verify_name (db, (const char *)key, nflavor);if (rc !=SEPOL_OK ) { goto exit; }@@ -204,6 +204,11 @@ int cil_gen_block(struct cil_db *db, struct cil_tree_node *parse_current, struct goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Blocks are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -274,6 +279,11 @@ int cil_gen_blockinherit(struct cil_db *db, struct cil_tree_node *parse_current, goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Block inherit rules are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -331,6 +341,11 @@ int cil_gen_blockabstract(struct cil_db *db, struct cil_tree_node *parse_current goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"Block abstract rules are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -376,6 +391,11 @@ int cil_gen_in(struct cil_db *db, struct cil_tree_node *parse_current, struct ci goto exit; } +if (db->qualified_names) { +cil_log (CIL_ERR ,"In-statements are not allowed when the option for qualified names is used\n" ); + goto exit; + } + rc =__cil_verify_syntax (parse_current, syntax, syntax_len);if (rc !=SEPOL_OK ) { goto exit;@@ -5261,7 +5281,7 @@ int cil_gen_macro(struct cil_db *db, struct cil_tree_node *parse_current, struct param->str = current_item->cl_head->next->data; - rc =cil_verify_name (param->str, param->flavor); + rc =cil_verify_name (db, param->str, param->flavor);if (rc !=SEPOL_OK ) {cil_destroy_param (param); goto exit;libsepol/cil/src/cil_internal.h +1
-0@@ -321,6 +321,7 @@ struct cil_db {int handle_unknown;int mls;int multiple_decls; +int qualified_names;int target_platform;int policy_version; };libsepol/cil/src/cil_resolve_ast.c +2
-2@@ -4409,8 +4409,8 @@ int cil_resolve_name_keep_aliases(struct cil_tree_node *ast_node, char *name, en *datum =NULL ; -if (strchr (name,'.' ) ==NULL ) { -/* No '.' in name */ +if (db->qualified_names ||strchr (name,'.' ) ==NULL ) { +/* Using qualified names or No '.' in name */ rc =__cil_resolve_name_helper (db, ast_node->parent, name, sym_index, datum);if (rc !=SEPOL_OK ) { goto exit;libsepol/cil/src/cil_verify.c +14
-5@@ -92,7 +92,7 @@ static int __cil_is_reserved_name(const char *name, enum cil_flavor flavor)return CIL_FALSE ; } -int cil_verify_name (const char *name,enum cil_flavor flavor) +int cil_verify_name (const struct cil_db *db,const char *name,enum cil_flavor flavor) {int rc =SEPOL_ERR ;int len;@@ -116,10 +116,19 @@ int cil_verify_name(const char *name, enum cil_flavor flavor) goto exit; } -for (i =1 ; i < len; i++) { -if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' ) { -cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); - goto exit; +if (db->qualified_names ==CIL_FALSE ) { +for (i =1 ; i < len; i++) { +if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' ) { +cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); + goto exit; + } + } + }else { +for (i =1 ; i < len; i++) { +if (!isalnum (name[i]) && name[i] !='_' && name[i] !='-' && name[i] !='.' ) { +cil_log (CIL_ERR ,"Invalid character \"%c\" in %s\n" , name[i], name); + goto exit; + } } }libsepol/cil/src/cil_verify.h +1
-1@@ -56,7 +56,7 @@ struct cil_args_verify {int *pass; }; -int cil_verify_name (const char *name,enum cil_flavor flavor); +int cil_verify_name (const struct cil_db *db,const char *name,enum cil_flavor flavor);int __cil_verify_syntax (struct cil_tree_node *parse_current,enum cil_syntax s[],int len);int cil_verify_expr_syntax (struct cil_tree_node *current,enum cil_flavor op,enum cil_flavor expr_flavor);int cil_verify_constraint_leaf_expr_syntax (enum cil_flavor l_flavor,enum cil_flavor r_flavor,enum cil_flavor op,enum cil_flavor expr_flavor);libsepol/src/libsepol.map.in +1
-1@@ -272,4 +272,5 @@ LIBSEPOL_3.0 { cil_write_parse_ast; cil_write_build_ast; cil_write_resolve_ast; + cil_set_qualified_names; } LIBSEPOL_1.1; --2.31.1