Skip to contentSkip to conversation

libsepol: Fix potential use of an uninitialized value in link.c

PATCH Applied James Carter 2 participants 2 messages Jan 22 – Jan 26 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libsepol: Fix potential use of an uninitialized value in link.c

The fields in struct missing_requirement are not assigned a value in the case where a class is required but not in scope for an optional block. This results in the use of an uninitialized value in print_missing_requirements(). The fields of the struct are assigned correctly when the permission of a class is not in scope.

Assign values to the fields of the struct missing_requirement when exiting early because the class is not in scope. Use 0 for the permission index and only print the class name in print_missing_requirements() if the permission index is 0.

Reported-by oss-fuzz (issue 472084713)
---
 libsepol/src/link.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)
libsepol/src/link.c +16 -11
index da65257a..188b4020 100644
@@ -1987,6 +1987,9 @@ static int is_decl_requires_met(link_state_t * state,
 
 
 		if (!is_id_enabled(id, state->base, SYM_CLASSES)) {
+			req->symbol_type = SYM_CLASSES;
+			req->symbol_value = i + 1;
+			req->perm_value = 0;
 			return 0;
 		}
 
@@ -2109,20 +2112,22 @@ static void print_missing_requirements(link_state_t * state,
 	    cur->branch_list->module_name : "BASE";
 
 	if (req->symbol_type == SYM_CLASSES) {
-
 		struct find_perm_arg fparg;
+		class_datum_t *cladatum = p->class_val_to_struct[req->symbol_value - 1];
 
-		class_datum_t *cladatum;
-		cladatum = p->class_val_to_struct[req->symbol_value - 1];
-
-		fparg.valuep = req->perm_value;
-		fparg.key = NULL;
-		(void)hashtab_map(cladatum->permissions.table, find_perm, &fparg);
+		if (req->perm_value == 0) {
+			ERR(state->handle, "%s's global requirements were not met: class %s",
+				mod_name, p->p_class_val_to_name[req->symbol_value - 1]);
+		} else {
+			fparg.valuep = req->perm_value;
+			fparg.key = NULL;
+			(void)hashtab_map(cladatum->permissions.table, find_perm, &fparg);
 
-		ERR(state->handle,
-		    "%s's global requirements were not met: class %s, permission %s",
-		    mod_name,
-		    p->p_class_val_to_name[req->symbol_value - 1], fparg.key);
+			ERR(state->handle,
+				"%s's global requirements were not met: class %s, permission %s",
+				mod_name,
+				p->p_class_val_to_name[req->symbol_value - 1], fparg.key);
+		}
 	} else {
 		ERR(state->handle,
 		    "%s's global requirements were not met: %s %s",
Signature · 1 line
2.52.0
Applied
#1 lore raw
Quoted 6 lines · James Carter

The fields in struct missing_requirement are not assigned a value in the case where a class is required but not in scope for an optional block. This results in the use of an uninitialized value in print_missing_requirements(). The fields of the struct are assigned correctly when the permission of a class is not in scope.

Quoted 7 lines

Assign values to the fields of the struct missing_requirement when exiting early because the class is not in scope. Use 0 for the permission index and only print the class name in print_missing_requirements() if the permission index is 0.

Reported-by oss-fuzz (issue 472084713)

Thanks, applied.

Quoted 56 lines
---
 libsepol/src/link.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)
libsepol/src/link.c +16 -11
index da65257a..188b4020 100644
@@ -1987,6 +1987,9 @@ static int is_decl_requires_met(link_state_t * state,
 
 
 		if (!is_id_enabled(id, state->base, SYM_CLASSES)) {
+			req->symbol_type = SYM_CLASSES;
+			req->symbol_value = i + 1;
+			req->perm_value = 0;
 			return 0;
 		}
 
@@ -2109,20 +2112,22 @@ static void print_missing_requirements(link_state_t * state,
 	    cur->branch_list->module_name : "BASE";
 
 	if (req->symbol_type == SYM_CLASSES) {
-
 		struct find_perm_arg fparg;
+		class_datum_t *cladatum = p->class_val_to_struct[req->symbol_value - 1];
 
-		class_datum_t *cladatum;
-		cladatum = p->class_val_to_struct[req->symbol_value - 1];
-
-		fparg.valuep = req->perm_value;
-		fparg.key = NULL;
-		(void)hashtab_map(cladatum->permissions.table, find_perm, &fparg);
+		if (req->perm_value == 0) {
+			ERR(state->handle, "%s's global requirements were not met: class %s",
+				mod_name, p->p_class_val_to_name[req->symbol_value - 1]);
+		} else {
+			fparg.valuep = req->perm_value;
+			fparg.key = NULL;
+			(void)hashtab_map(cladatum->permissions.table, find_perm, &fparg);
 
-		ERR(state->handle,
-		    "%s's global requirements were not met: class %s, permission %s",
-		    mod_name,
-		    p->p_class_val_to_name[req->symbol_value - 1], fparg.key);
+			ERR(state->handle,
+				"%s's global requirements were not met: class %s, permission %s",
+				mod_name,
+				p->p_class_val_to_name[req->symbol_value - 1], fparg.key);
+		}
 	} else {
 		ERR(state->handle,
 		    "%s's global requirements were not met: %s %s",
Signature · 1 line
2.52.0