Skip to contentSkip to conversation

libsepol/cil: Initialize the multiple_decls field of the cil db

PATCH Applied James Carter 3 participants 6 messages May 26, 2020 – May 29, 2020 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 libsepol/cil: Initialize the multiple_decls field of the cil db

Initialize the multiple_decls field when intializing the structure cil_db.

Fixes fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare types[attributes]")
---
 libsepol/cil/src/cil.c | 1 +
 1 file changed, 1 insertion(+)
libsepol/cil/src/cil.c +1 -0
index 4a77aa9c..a3c6a293 100644
@@ -459,6 +459,7 @@ void cil_db_init(struct cil_db **db)
 	(*db)->preserve_tunables = CIL_FALSE;
 	(*db)->handle_unknown = -1;
 	(*db)->mls = -1;
+	(*db)->multiple_decls = CIL_FALSE;
 	(*db)->target_platform = SEPOL_TARGET_SELINUX;
 	(*db)->policy_version = POLICYDB_VERSION_MAX;
 }
Signature · 1 line
2.25.4
#1 lore raw

PATCH v3 2/2 libsepol/cil: Return error when identifier declared as both type and attribute

CIL allows a type to be redeclared when using the multiple declarations option ("-m" or "--muliple-decls"), but make it an error for an identifier to be declared as both a type and an attribute.

Change the error message so that it always gives the location and flavor of both declarations. The flavors will be the same in all other cases, but in this case they explain why there is an error even if multiple declartions are allowed.

Fixes Commit fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare types[attributes]")

---
v2: Added these changes
v3: Removed the error message about not creating a node

 libsepol/cil/src/cil_build_ast.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)
libsepol/cil/src/cil_build_ast.c +16 -12
index fcecdc4f..60ecaaff 100644
@@ -87,7 +87,7 @@ exit:
  * datum, given the new datum and the one already present in a given symtab.
  */
 int cil_is_datum_multiple_decl(__attribute__((unused)) struct cil_symtab_datum *cur,
-                               __attribute__((unused)) struct cil_symtab_datum *old,
+                               struct cil_symtab_datum *old,
                                enum cil_flavor f)
 {
 	int rc = CIL_FALSE;
@@ -95,8 +95,12 @@ int cil_is_datum_multiple_decl(__attribute__((unused)) struct cil_symtab_datum *
 	switch (f) {
 	case CIL_TYPE:
 	case CIL_TYPEATTRIBUTE:
-		/* type and typeattribute statements insert empty datums, ret true */
-		rc = CIL_TRUE;
+		if (!old || f != FLAVOR(old)) {
+			rc = CIL_FALSE;
+		} else {
+			/* type and typeattribute statements insert empty datums */
+			rc = CIL_TRUE;
+		}
 		break;
 	default:
 		break;
@@ -126,19 +130,20 @@ int cil_gen_node(struct cil_db *db, struct cil_tree_node *ast_node, struct cil_s
 	if (symtab != NULL) {
 		rc = cil_symtab_insert(symtab, (hashtab_key_t)key, datum, ast_node);
 		if (rc == SEPOL_EEXIST) {
+			rc = cil_symtab_get_datum(symtab, (hashtab_key_t)key, &prev);
+			if (rc != SEPOL_OK) {
+				cil_log(CIL_ERR, "Re-declaration of %s %s, but previous declaration could not be found\n",cil_node_to_string(ast_node), key);
+				goto exit;
+			}
 			if (!db->multiple_decls ||
-			    cil_symtab_get_datum(symtab, (hashtab_key_t)key, &prev) != SEPOL_OK ||
 			    !cil_is_datum_multiple_decl(datum, prev, nflavor)) {
-
 				/* multiple_decls not ok, ret error */
+				struct cil_tree_node *node = NODE(prev);
 				cil_log(CIL_ERR, "Re-declaration of %s %s\n",
 					cil_node_to_string(ast_node), key);
-				if (cil_symtab_get_datum(symtab, key, &datum) == SEPOL_OK) {
-					if (sflavor == CIL_SYM_BLOCKS) {
-						struct cil_tree_node *node = datum->nodes->head->data;
-						cil_tree_log(node, CIL_ERR, "Previous declaration");
-					}
-				}
+				cil_tree_log(node, CIL_ERR, "Previous declaration of %s",
+					cil_node_to_string(node));
+				rc = SEPOL_ERR;
 				goto exit;
 			}
 			/* multiple_decls is enabled and works for this datum type, add node */
@@ -169,7 +174,6 @@ int cil_gen_node(struct cil_db *db, struct cil_tree_node *ast_node, struct cil_s
 	return SEPOL_OK;
 
 exit:
-	cil_log(CIL_ERR, "Failed to create node\n");
 	return rc;
 }
 
Signature · 1 line
2.25.4
#2 lore raw

Re: [PATCH v3 2/2] libsepol/cil: Return error when identifier declared as both type and attribute

Quoted 4 lines · James Carter

CIL allows a type to be redeclared when using the multiple declarations option ("-m" or "--muliple-decls"), but make it an error for an identifier to be declared as both a type and an attribute.

Quoted 8 lines

Change the error message so that it always gives the location and flavor of both declarations. The flavors will be the same in all other cases, but in this case they explain why there is an error even if multiple declartions are allowed.

Fixes Commit fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare types[attributes]")

Thanks, this prevents mismatching declarations. Does this also fix the memory issue and prevent that buggy policy could get loaded sometimes?

-Topi

#3 lore raw

Re: [PATCH v3 2/2] libsepol/cil: Return error when identifier declared as both type and attribute

Quoted 11 lines · Topi Miettinen
Quoted 9 lines · James Carter

CIL allows a type to be redeclared when using the multiple declarations option ("-m" or "--muliple-decls"), but make it an error for an identifier to be declared as both a type and an attribute.

Change the error message so that it always gives the location and flavor of both declarations. The flavors will be the same in all other cases, but in this case they explain why there is an error even if multiple declartions are allowed.

Quoted 7 lines
Quoted 3 lines
Fixes Commit fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare types[attributes]")

Thanks, this prevents mismatching declarations. Does this also fix the memory issue and prevent that buggy policy could get loaded sometimes?

Yes, the two patches together will prevent the buggy policy from being loaded. It will always give an error now.

Jim

Quoted 1 line

-Topi

maintainer Acked-by on v3 2/2
#4 lore raw

Re: [PATCH v3 2/2] libsepol/cil: Return error when identifier declared as both type and attribute

In reply to James Carter
Quoted 5 lines · James Carter

CIL allows a type to be redeclared when using the multiple declarations option ("-m" or "--muliple-decls"), but make it an error for an identifier to be declared as both a type and an attribute.

Quoted 8 lines

Change the error message so that it always gives the location and flavor of both declarations. The flavors will be the same in all other cases, but in this case they explain why there is an error even if multiple declartions are allowed.

Fixes Commit fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare types[attributes]")
maintainer Applied
#5 lore raw

Re: [PATCH v3 2/2] libsepol/cil: Return error when identifier declared as both type and attribute

Quoted 12 lines · Stephen Smalley
Quoted 10 lines · James Carter

CIL allows a type to be redeclared when using the multiple declarations option ("-m" or "--muliple-decls"), but make it an error for an identifier to be declared as both a type and an attribute.

Change the error message so that it always gives the location and flavor of both declarations. The flavors will be the same in all other cases, but in this case they explain why there is an error even if multiple declartions are allowed.

Quoted 5 lines
Quoted 3 lines
Fixes Commit fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare types[attributes]")

Applied.