RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-15 10:34:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsepol/cil: Add line mark kind and line number to src info

Browse Source 
To be able to write line mark information when writing the AST,
the line mark kind and line number is needed in the src info.

Instead of indicating whether the src info is for CIL or a hll,
differentiate between CIL, a normal hll line mark, and an expanded
hll line mark. Also include the line mark line number in the src
info nodes.

Signed-off-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
James Carter 2021-08-16 13:44:29 -04:00
parent 31aa43d258
commit fb9ed092da
6 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsepol/cil/src/cil.c
View File

@ -220,7 +220,9 @@ char *CIL_KEY_IOCTL;
char *CIL_KEY_UNORDERED; char *CIL_KEY_UNORDERED;
char *CIL_KEY_SRC_INFO; char *CIL_KEY_SRC_INFO;
char *CIL_KEY_SRC_CIL; char *CIL_KEY_SRC_CIL;
char *CIL_KEY_SRC_HLL; char *CIL_KEY_SRC_HLL_LMS;
char *CIL_KEY_SRC_HLL_LMX;
char *CIL_KEY_SRC_HLL_LME;
static void cil_init_keys(void) static void cil_init_keys(void)
{ {
@ -384,8 +386,10 @@ static void cil_init_keys(void)
CIL_KEY_IOCTL = cil_strpool_add("ioctl"); CIL_KEY_IOCTL = cil_strpool_add("ioctl");
CIL_KEY_UNORDERED = cil_strpool_add("unordered"); CIL_KEY_UNORDERED = cil_strpool_add("unordered");
CIL_KEY_SRC_INFO = cil_strpool_add("<src_info>"); CIL_KEY_SRC_INFO = cil_strpool_add("<src_info>");
CIL_KEY_SRC_CIL = cil_strpool_add("<src_cil>"); CIL_KEY_SRC_CIL = cil_strpool_add("cil");
CIL_KEY_SRC_HLL = cil_strpool_add("<src_hll>"); CIL_KEY_SRC_HLL_LMS = cil_strpool_add("lms");
CIL_KEY_SRC_HLL_LMX = cil_strpool_add("lmx");
CIL_KEY_SRC_HLL_LME = cil_strpool_add("lme");
} }
void cil_db_init(struct cil_db **db) void cil_db_init(struct cil_db **db)
@ -2881,6 +2885,7 @@ void cil_mls_init(struct cil_mls **mls)
void cil_src_info_init(struct cil_src_info **info) void cil_src_info_init(struct cil_src_info **info)
{ {
*info = cil_malloc(sizeof(**info)); *info = cil_malloc(sizeof(**info));
(*info)->is_cil = 0; (*info)->kind = NULL;
(*info)->hll_line = 0;
(*info)->path = NULL; (*info)->path = NULL;
} }

17
libsepol/cil/src/cil_build_ast.c
View File

@ -6060,6 +6060,7 @@ int cil_gen_src_info(struct cil_tree_node *parse_current, struct cil_tree_node *
CIL_SYN_STRING, CIL_SYN_STRING,
CIL_SYN_STRING, CIL_SYN_STRING,
CIL_SYN_STRING, CIL_SYN_STRING,
CIL_SYN_STRING,
CIL_SYN_N_LISTS | CIL_SYN_END, CIL_SYN_N_LISTS | CIL_SYN_END,
CIL_SYN_END CIL_SYN_END
}; };
@ -6077,8 +6078,19 @@ int cil_gen_src_info(struct cil_tree_node *parse_current, struct cil_tree_node *
cil_src_info_init(&info); cil_src_info_init(&info);
info->is_cil = (parse_current->next->data == CIL_KEY_SRC_CIL) ? CIL_TRUE : CIL_FALSE; info->kind = parse_current->next->data;
info->path = parse_current->next->next->data; if (info->kind != CIL_KEY_SRC_CIL && info->kind != CIL_KEY_SRC_HLL_LMS && info->kind != CIL_KEY_SRC_HLL_LMX) {
cil_log(CIL_ERR, "Invalid src info kind\n");
rc = SEPOL_ERR;
goto exit;
}
rc = cil_string_to_uint32(parse_current->next->next->data, &info->hll_line, 10);
if (rc != SEPOL_OK) {
goto exit;
}
info->path = parse_current->next->next->next->data;
ast_node->data = info; ast_node->data = info;
ast_node->flavor = CIL_SRC_INFO; ast_node->flavor = CIL_SRC_INFO;
@ -6087,6 +6099,7 @@ int cil_gen_src_info(struct cil_tree_node *parse_current, struct cil_tree_node *
exit: exit:
cil_tree_log(parse_current, CIL_ERR, "Bad src info"); cil_tree_log(parse_current, CIL_ERR, "Bad src info");
cil_destroy_src_info(info);
return rc; return rc;
} }

3
libsepol/cil/src/cil_copy_ast.c
View File

@ -1692,7 +1692,8 @@ int cil_copy_src_info(__attribute__((unused)) struct cil_db *db, void *data, voi
cil_src_info_init(&new); cil_src_info_init(&new);
new->is_cil = orig->is_cil; new->kind = orig->kind;
new->hll_line = orig->hll_line;
new->path = orig->path; new->path = orig->path;
*copy = new; *copy = new;

7
libsepol/cil/src/cil_internal.h
View File

@ -236,7 +236,9 @@ extern char *CIL_KEY_IOCTL;
extern char *CIL_KEY_UNORDERED; extern char *CIL_KEY_UNORDERED;
extern char *CIL_KEY_SRC_INFO; extern char *CIL_KEY_SRC_INFO;
extern char *CIL_KEY_SRC_CIL; extern char *CIL_KEY_SRC_CIL;
extern char *CIL_KEY_SRC_HLL; extern char *CIL_KEY_SRC_HLL_LMS;
extern char *CIL_KEY_SRC_HLL_LMX;
extern char *CIL_KEY_SRC_HLL_LME;
/* /*
Symbol Table Array Indices Symbol Table Array Indices
@ -963,7 +965,8 @@ struct cil_mls {
}; };
struct cil_src_info { struct cil_src_info {
int is_cil; char *kind;
uint32_t hll_line;
char *path; char *path;
}; };

27
libsepol/cil/src/cil_parser.c
View File

@ -44,10 +44,6 @@
#define CIL_PARSER_MAX_EXPR_DEPTH (0x1 << 12) #define CIL_PARSER_MAX_EXPR_DEPTH (0x1 << 12)
char *CIL_KEY_HLL_LMS;
char *CIL_KEY_HLL_LMX;
char *CIL_KEY_HLL_LME;
struct hll_info { struct hll_info {
uint32_t hll_lineno; uint32_t hll_lineno;
uint32_t hll_expand; uint32_t hll_expand;
@ -102,7 +98,6 @@ static int add_hll_linemark(struct cil_tree_node **current, uint32_t *hll_lineno
char *hll_type; char *hll_type;
struct cil_tree_node *node; struct cil_tree_node *node;
struct token tok; struct token tok;
char *hll_file;
int rc; int rc;
cil_lexer_next(&tok); cil_lexer_next(&tok);
@ -111,11 +106,11 @@ static int add_hll_linemark(struct cil_tree_node **current, uint32_t *hll_lineno
goto exit; goto exit;
} }
hll_type = cil_strpool_add(tok.value); hll_type = cil_strpool_add(tok.value);
if (hll_type != CIL_KEY_HLL_LME && hll_type != CIL_KEY_HLL_LMS && hll_type != CIL_KEY_HLL_LMX) { if (hll_type != CIL_KEY_SRC_HLL_LME && hll_type != CIL_KEY_SRC_HLL_LMS && hll_type != CIL_KEY_SRC_HLL_LMX) {
cil_log(CIL_ERR, "Invalid line mark syntax\n"); cil_log(CIL_ERR, "Invalid line mark syntax\n");
goto exit; goto exit;
} }
if (hll_type == CIL_KEY_HLL_LME) { if (hll_type == CIL_KEY_SRC_HLL_LME) {
if (cil_stack_is_empty(stack)) { if (cil_stack_is_empty(stack)) {
cil_log(CIL_ERR, "Line mark end without start\n"); cil_log(CIL_ERR, "Line mark end without start\n");
goto exit; goto exit;
@ -132,7 +127,7 @@ static int add_hll_linemark(struct cil_tree_node **current, uint32_t *hll_lineno
create_node(&node, *current, tok.line, *hll_lineno, CIL_KEY_SRC_INFO); create_node(&node, *current, tok.line, *hll_lineno, CIL_KEY_SRC_INFO);
insert_node(node, *current); insert_node(node, *current);
create_node(&node, *current, tok.line, *hll_lineno, CIL_KEY_SRC_HLL); create_node(&node, *current, tok.line, *hll_lineno, hll_type);
insert_node(node, *current); insert_node(node, *current);
cil_lexer_next(&tok); cil_lexer_next(&tok);
@ -141,12 +136,15 @@ static int add_hll_linemark(struct cil_tree_node **current, uint32_t *hll_lineno
goto exit; goto exit;
} }
create_node(&node, *current, tok.line, *hll_lineno, cil_strpool_add(tok.value));
insert_node(node, *current);
rc = cil_string_to_uint32(tok.value, hll_lineno, 10); rc = cil_string_to_uint32(tok.value, hll_lineno, 10);
if (rc != SEPOL_OK) { if (rc != SEPOL_OK) {
goto exit; goto exit;
} }
*hll_expand = (hll_type == CIL_KEY_HLL_LMX) ? 1 : 0; *hll_expand = (hll_type == CIL_KEY_SRC_HLL_LMX) ? 1 : 0;
cil_lexer_next(&tok); cil_lexer_next(&tok);
if (tok.type != SYMBOL && tok.type != QSTRING) { if (tok.type != SYMBOL && tok.type != QSTRING) {
@ -159,9 +157,7 @@ static int add_hll_linemark(struct cil_tree_node **current, uint32_t *hll_lineno
tok.value = tok.value+1; tok.value = tok.value+1;
} }
hll_file = cil_strpool_add(tok.value); create_node(&node, *current, tok.line, *hll_lineno, cil_strpool_add(tok.value));
create_node(&node, *current, tok.line, *hll_lineno, hll_file);
insert_node(node, *current); insert_node(node, *current);
} }
@ -192,6 +188,9 @@ static void add_cil_path(struct cil_tree_node **current, char *path)
create_node(&node, *current, 0, 0, CIL_KEY_SRC_CIL); create_node(&node, *current, 0, 0, CIL_KEY_SRC_CIL);
insert_node(node, *current); insert_node(node, *current);
create_node(&node, *current, 0, 0, cil_strpool_add("1"));
insert_node(node, *current);
create_node(&node, *current, 0, 0, path); create_node(&node, *current, 0, 0, path);
insert_node(node, *current); insert_node(node, *current);
} }
@ -211,10 +210,6 @@ int cil_parser(const char *_path, char *buffer, uint32_t size, struct cil_tree *
struct token tok; struct token tok;
int rc = SEPOL_OK; int rc = SEPOL_OK;
CIL_KEY_HLL_LMS = cil_strpool_add("lms");
CIL_KEY_HLL_LMX = cil_strpool_add("lmx");
CIL_KEY_HLL_LME = cil_strpool_add("lme");
cil_stack_init(&stack); cil_stack_init(&stack);
cil_lexer_setup(buffer, size); cil_lexer_setup(buffer, size);

2
libsepol/cil/src/cil_tree.c
View File

@ -71,7 +71,7 @@ struct cil_tree_node *cil_tree_get_next_path(struct cil_tree_node *node, char **
/* AST */ /* AST */
struct cil_src_info *info = node->data; struct cil_src_info *info = node->data;
*path = info->path; *path = info->path;
*is_cil = info->is_cil; *is_cil = (info->kind == CIL_KEY_SRC_CIL);
return node; return node;
} else { } else {
if (node->flavor == CIL_CALL) { if (node->flavor == CIL_CALL) {