Skip to contentSkip to conversation

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

PATCH Superseded James Carter 2 participants 3 messages May 18, 2020 SELinux security module

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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

Initialize the multiple_decls field when intializing the structure cil_db.

Issue reported by: Topi Miettinen <[email protected]>

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
maintainer
#1 lore raw
Quoted 8 lines · James Carter

Initialize the multiple_decls field when intializing the structure cil_db.

Issue reported by: Topi Miettinen <[email protected]>

Fixes fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare

types[attributes]")

I guess this explains the non-deterministic behavior and valgrind warning about uninitialized data, but what about the segfault? Don't we still need to fix the case when multiple_decls is set to TRUE?

Quoted 20 lines
---
 libsepol/cil/src/cil.c | 1 +
 1 file changed, 1 insertion(+)
libsepol/cil/src/cil.c +1 -1
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;
 }
--

2.25.4

#2 lore raw
Quoted 6 lines · Stephen Smalley
Quoted 4 lines · James Carter

Initialize the multiple_decls field when intializing the structure cil_db.

Quoted 8 lines
Quoted 4 lines

Issue reported by: Topi Miettinen <[email protected]>

Fixes fafe4c212bf6c32c ("libsepol: cil: Add ability to redeclare

types[attributes]")

I guess this explains the non-deterministic behavior and valgrind warning about uninitialized data, but what about the segfault? Don't we still need to fix the case when multiple_decls is set to TRUE?

Yes. I am working on that. I believe the segfault occurs when you declare something both a type and a typeattribute.

Jim

Quoted 21 lines
Quoted 21 lines
---
 libsepol/cil/src/cil.c | 1 +
 1 file changed, 1 insertion(+)
libsepol/cil/src/cil.c +1 -1
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;
 }
--

2.25.4