tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libsepol: cil: show an error when cil_expr_to_string() fails

Browse source 
cil_tree_print_expr() calls cil_expr_to_string() in order to compute a
string expression into expr_str. If this function fails, expr_str is
left unitialized but its value is dereferenced with:

    cil_log(CIL_INFO, "%s)", expr_str);

Prevent such an issue by checking cil_expr_to_string()'s return value
before using expr_str.

This issue has been found with clang's static analyzer.

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss 2018-03-05 23:58:19 +01:00 committed by Stephen Smalley
parent 3217d717c8
commit 2bd82070ef
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libsepol/cil/src/cil_tree.c
View file

@ -503,15 +503,19 @@ exit:
void cil_tree_print_expr(struct cil_list *datum_expr, struct cil_list *str_expr)
{
char *expr_str;
int rc;
cil_log(CIL_INFO, "(");
if (datum_expr != NULL) {
cil_expr_to_string(datum_expr, &expr_str);
rc = cil_expr_to_string(datum_expr, &expr_str);
} else {
cil_expr_to_string(str_expr, &expr_str);
rc = cil_expr_to_string(str_expr, &expr_str);
}
if (rc < 0) {
cil_log(CIL_INFO, "ERROR)");
return;
}
cil_log(CIL_INFO, "%s)", expr_str);
free(expr_str);
}