Skip to contentSkip to conversation

libsepol: Fix RESOURCE_LEAK defects reported by coverity scan

PATCH Superseded Petr Lautrbach 3 participants 14 messages Jan 31, 2019 – Feb 10, 2019 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 libsepol: Fix RESOURCE_LEAK defects reported by coverity scan

---
 libsepol/cil/src/cil_binary.c      | 12 ++++++++++++
 libsepol/cil/src/cil_resolve_ast.c | 10 ++++++++++
 libsepol/cil/src/cil_symtab.c      |  1 +
 libsepol/src/expand.c              |  3 +++
 libsepol/src/kernel_to_cil.c       |  2 ++
 libsepol/src/kernel_to_conf.c      |  2 ++
 6 files changed, 30 insertions(+)
libsepol/cil/src/cil_binary.c +12 -0
index 0cc6eeb1..a645c95d 100644
@@ -912,6 +912,8 @@ int cil_sensalias_to_policydb(policydb_t *pdb, struct cil_alias *cil_alias)
 	key = cil_strdup(cil_alias->datum.fqn);
 	rc = symtab_insert(pdb, SYM_LEVELS, key, sepol_alias, SCOPE_DECL, 0, NULL);
 	if (rc != SEPOL_OK) {
+		if (rc == 1)
+			free(sepol_alias);
 		goto exit;
 	}
 
@@ -1763,11 +1765,13 @@ int __cil_avrulex_ioctl_to_hashtable(hashtab_t h, uint16_t kind, uint32_t src, u
 		hashtab_xperms = cil_malloc(sizeof(*hashtab_xperms));
 		rc = ebitmap_cpy(hashtab_xperms, xperms);
 		if (rc != SEPOL_OK) {
+			free(hashtab_xperms);
 			free(avtab_key);
 			goto exit;
 		}
 		rc = hashtab_insert(h, (hashtab_key_t)avtab_key, hashtab_xperms);
 		if (rc != SEPOL_OK) {
+			free(hashtab_xperms);
 			free(avtab_key);
 			goto exit;
 		}
@@ -2157,6 +2161,7 @@ static int __cil_cond_expr_to_sepol_expr_helper(policydb_t *pdb, struct cil_list
 			op->expr_type = COND_NEQ;
 			break;
 		default:
+			free(op);
 			goto exit;
 		}
 
@@ -2283,6 +2288,7 @@ int cil_booleanif_to_policydb(policydb_t *pdb, const struct cil_db *db, struct c
 
 	cond_expr_destroy(tmp_cond->expr);
 	free(tmp_cond);
+	tmp_cond = NULL;
 
 	for (cb_node = node->cl_head; cb_node != NULL; cb_node = cb_node->next) {
 		if (cb_node->flavor == CIL_CONDBLOCK) {
@@ -2327,6 +2333,11 @@ int cil_booleanif_to_policydb(policydb_t *pdb, const struct cil_db *db, struct c
 	return SEPOL_OK;
 
 exit:
+	if (tmp_cond) {
+		if (tmp_cond->expr)
+			cond_expr_destroy(tmp_cond->expr);
+		free(tmp_cond);
+	}
 	return rc;
 }
 
@@ -4797,6 +4808,7 @@ static struct cil_list *cil_classperms_from_sepol(policydb_t *pdb, uint16_t clas
 	return cp_list;
 
 exit:
+	free(cp);
 	cil_log(CIL_ERR,"Failed to create CIL class-permissions from sepol values\n");
 	return NULL;
 }
libsepol/cil/src/cil_resolve_ast.c +10 -0
index fb9d9174..91187ed7 100644
@@ -1522,6 +1522,7 @@ int cil_resolve_sidorder(struct cil_tree_node *current, void *extra_args)
 		rc = cil_resolve_name(current, (char *)curr->data, CIL_SYM_SIDS, extra_args, &datum);
 		if (rc != SEPOL_OK) {
 			cil_log(CIL_ERR, "Failed to resolve sid %s in sidorder\n", (char *)curr->data);
+			free(new);
 			goto exit;
 		}
 		cil_list_append(new, CIL_SID, datum);
@@ -1591,6 +1592,8 @@ int cil_resolve_catorder(struct cil_tree_node *current, void *extra_args)
 	return SEPOL_OK;
 
 exit:
+	if (new)
+		free(new);
 	return rc;
 }
 
@@ -1624,6 +1627,7 @@ int cil_resolve_sensitivityorder(struct cil_tree_node *current, void *extra_args
 	return SEPOL_OK;
 
 exit:
+	free(new);
 	return rc;
 }
 
@@ -2853,6 +2857,7 @@ int cil_resolve_call1(struct cil_tree_node *current, void *extra_args)
 					rc = cil_fill_cats(pc, &catset->cats);
 					if (rc != SEPOL_OK) {
 						cil_destroy_catset(catset);
+						cil_destroy_args(new_arg);
 						goto exit;
 					}
 					cil_tree_node_init(&cat_node);
@@ -2877,6 +2882,7 @@ int cil_resolve_call1(struct cil_tree_node *current, void *extra_args)
 					if (rc != SEPOL_OK) {
 						cil_log(CIL_ERR, "Failed to create anonymous level, rc: %d\n", rc);
 						cil_destroy_level(level);
+						cil_destroy_args(new_arg);
 						goto exit;
 					}
 					cil_tree_node_init(&lvl_node);
@@ -2901,6 +2907,7 @@ int cil_resolve_call1(struct cil_tree_node *current, void *extra_args)
 					if (rc != SEPOL_OK) {
 						cil_log(CIL_ERR, "Failed to create anonymous levelrange, rc: %d\n", rc);
 						cil_destroy_levelrange(range);
+						cil_destroy_args(new_arg);
 						goto exit;
 					}
 					cil_tree_node_init(&range_node);
@@ -2925,6 +2932,7 @@ int cil_resolve_call1(struct cil_tree_node *current, void *extra_args)
 					if (rc != SEPOL_OK) {
 						cil_log(CIL_ERR, "Failed to create anonymous ip address, rc: %d\n", rc);
 						cil_destroy_ipaddr(ipaddr);
+						cil_destroy_args(new_arg);
 						goto exit;
 					}
 					cil_tree_node_init(&addr_node);
@@ -2955,6 +2963,7 @@ int cil_resolve_call1(struct cil_tree_node *current, void *extra_args)
 					if (rc != SEPOL_OK) {
 						cil_log(CIL_ERR, "Failed to create anonymous classpermission\n");
 						cil_destroy_classpermission(cp);
+						cil_destroy_args(new_arg);
 						goto exit;
 					}
 					cil_tree_node_init(&cp_node);
@@ -2970,6 +2979,7 @@ int cil_resolve_call1(struct cil_tree_node *current, void *extra_args)
 			default:
 				cil_log(CIL_ERR, "Unexpected flavor: %d\n", 
 						(((struct cil_param*)item->data)->flavor));
+				cil_destroy_args(new_arg);
 				rc = SEPOL_ERR;
 				goto exit;
 			}
libsepol/cil/src/cil_symtab.c +1 -0
index 3769979b..2970b863 100644
@@ -185,6 +185,7 @@ int cil_complex_symtab_insert(struct cil_complex_symtab *symtab,
 			ckey->key2 == curr->ckey->key2 &&
 			ckey->key3 == curr->ckey->key3 &&
 			ckey->key4 == curr->ckey->key4) {
+			free(node);
 			return SEPOL_EEXIST;
 		}
 
libsepol/src/expand.c +3 -0
index 6f1b235e..125a6809 100644
@@ -1451,6 +1451,7 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
 				new_trans->name = strdup(cur_rule->name);
 				if (!new_trans->name) {
 					ERR(state->handle, "Out of memory!");
+					free(new_trans);
 					return -1;
 				}
 				new_trans->stype = i + 1;
@@ -1460,6 +1461,8 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
 				otype = calloc(1, sizeof(*otype));
 				if (!otype) {
 					ERR(state->handle, "Out of memory!");
+					free(new_trans->name);
+					free(new_trans);
 					return -1;
 				}
 				otype->otype = mapped_otype;
libsepol/src/kernel_to_cil.c +2 -0
index 63e4d489..ec82f597 100644
@@ -2031,6 +2031,8 @@ static int write_cond_av_list_to_cil(FILE *out, struct policydb *pdb, cond_av_li
 	return 0;
 
 exit:
+	strs_free_all(strs);
+	strs_destroy(&strs);
 	return rc;
 }
 
libsepol/src/kernel_to_conf.c +2 -0
index 215d940c..afadca6b 100644
@@ -1999,6 +1999,8 @@ static int write_cond_av_list_to_conf(FILE *out, struct policydb *pdb, cond_av_l
 	return 0;
 
 exit:
+	strs_free_all(strs);
+	strs_destroy(&strs);
 	return rc;
 }
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 libselinux: Fix RESOURCE_LEAK defects reported by coverity scan

---
 libselinux/src/checkAccess.c        |  4 +++-
 libselinux/src/label_db.c           |  3 +++
 libselinux/src/label_file.c         |  4 +++-
 libselinux/src/load_policy.c        |  4 +++-
 libselinux/src/selinux_config.c     | 17 +++++++++--------
 libselinux/src/selinux_restorecon.c | 12 ++++++++++--
 6 files changed, 31 insertions(+), 13 deletions(-)
libselinux/src/checkAccess.c +3 -1
index 8de57477..16bfcfb6 100644
@@ -89,8 +89,10 @@ int selinux_check_passwd_access(access_vector_t requested)
 		int retval;
 
 		passwd_class = string_to_security_class("passwd");
-		if (passwd_class == 0)
+		if (passwd_class == 0) {
+			freecon(user_context);
 			return 0;
+		}
 
 		retval = security_compute_av_raw(user_context,
 						     user_context,
libselinux/src/label_db.c +3 -0
index c46d0a1d..fa481e04 100644
@@ -283,10 +283,12 @@ db_init(const struct selinux_opt *opts, unsigned nopts,
 	}
 	if (fstat(fileno(filp), &sb) < 0) {
 		free(catalog);
+    fclose(filp);
 		return NULL;
 	}
 	if (!S_ISREG(sb.st_mode)) {
 		free(catalog);
+    fclose(filp);
 		errno = EINVAL;
 		return NULL;
 	}
@@ -340,6 +342,7 @@ out_error:
 		free(spec->lr.ctx_trans);
 	}
 	free(catalog);
+	fclose(filp);
 
 	return NULL;
 }
libselinux/src/label_file.c +3 -1
index dbf51a93..b81fd552 100644
@@ -317,8 +317,10 @@ end_arch_check:
 			goto out;
 		}
 		rc = next_entry(str_buf, mmap_area, entry_len);
-		if (rc < 0)
+		if (rc < 0) {
+			free(str_buf);
 			goto out;
+		}
 
 		if (str_buf[entry_len - 1] != '\0') {
 			free(str_buf);
libselinux/src/load_policy.c +3 -1
index e9f1264a..20052beb 100644
@@ -262,8 +262,10 @@ checkbool:
 			rc = security_get_boolean_names(&names, &len);
 			if (!rc) {
 				values = malloc(sizeof(int) * len);
-				if (!values)
+				if (!values) {
+					free(names);
 					goto unmap;
+				}
 				for (i = 0; i < len; i++)
 					values[i] =
 						security_get_boolean_active(names[i]);
libselinux/src/selinux_config.c +9 -8
index 292728f3..b06cb63b 100644
@@ -177,8 +177,7 @@ static void init_selinux_config(void)
 
 			if (!strncasecmp(buf_p, SELINUXTYPETAG,
 					 sizeof(SELINUXTYPETAG) - 1)) {
-				selinux_policytype = type =
-				    strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
+				type = strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
 				if (!type)
 					return;
 				end = type + strlen(type) - 1;
@@ -187,6 +186,11 @@ static void init_selinux_config(void)
 					*end = 0;
 					end--;
 				}
+				if (setpolicytype(type) != 0) {
+					free(type);
+					return;
+				}
+				free(type);
 				continue;
 			} else if (!strncmp(buf_p, SETLOCALDEFS,
 					    sizeof(SETLOCALDEFS) - 1)) {
@@ -212,13 +216,10 @@ static void init_selinux_config(void)
 		fclose(fp);
 	}
 
-	if (!type) {
-		selinux_policytype = type = strdup(SELINUXDEFAULT);
-		if (!type)
-			return;
-	}
+	if (!selinux_policytype && setpolicytype(SELINUXDEFAULT) != 0)
+		return;
 
-	if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, type) == -1)
+	if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, selinux_policytype) == -1)
 		return;
 
 	for (i = 0; i < NEL; i++)
libselinux/src/selinux_restorecon.c +10 -2
index 42a48f5a..955732e5 100644
@@ -351,12 +351,19 @@ static int add_xattr_entry(const char *directory, bool delete_nonmatch,
 	new_entry->next = NULL;
 
 	new_entry->directory = strdup(directory);
-	if (!new_entry->directory)
+	if (!new_entry->directory) {
+		free(new_entry);
+		free(sha1_buf);
 		goto oom;
+	}
 
 	new_entry->digest = strdup(sha1_buf);
-	if (!new_entry->digest)
+	if (!new_entry->digest) {
+		free(new_entry->directory);
+		free(new_entry);
+		free(sha1_buf);
 		goto oom;
+	}
 
 	new_entry->result = digest_result;
 
@@ -850,6 +857,7 @@ int selinux_restorecon(const char *pathname_orig,
 
 	if (lstat(pathname, &sb) < 0) {
 		if (flags.ignore_noent && errno == ENOENT) {
+			free(xattr_value);
 			free(pathdnamer);
 			free(pathname);
 			return 0;
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH 2/3] libselinux: Fix RESOURCE_LEAK defects reported by coverity scan

Quoted 34 lines · Petr Lautrbach
---
 libselinux/src/checkAccess.c        |  4 +++-
 libselinux/src/label_db.c           |  3 +++
 libselinux/src/label_file.c         |  4 +++-
 libselinux/src/load_policy.c        |  4 +++-
 libselinux/src/selinux_config.c     | 17 +++++++++--------
 libselinux/src/selinux_restorecon.c | 12 ++++++++++--
 6 files changed, 31 insertions(+), 13 deletions(-)
libselinux/src/checkAccess.c +3 -1
index 8de57477..16bfcfb6 100644
@@ -89,8 +89,10 @@ int selinux_check_passwd_access(access_vector_t requested)
                int retval;
 
                passwd_class = string_to_security_class("passwd");
-               if (passwd_class == 0)
+               if (passwd_class == 0) {
+                       freecon(user_context);
                        return 0;
+               }
 
                retval = security_compute_av_raw(user_context,
                                                     user_context,
libselinux/src/label_db.c +0 -0
index c46d0a1d..fa481e04 100644
@@ -283,10 +283,12 @@ db_init(const struct selinux_opt *opts, unsigned nopts,
        }
        if (fstat(fileno(filp), &sb) < 0) {

libselinux/src/label_db.c db_init(const struct selinux_opt *opts, unsigned nopts, · line 294

Quoted 10 lines
libselinux/src/label_db.c +2 -0
                free(catalog);
+    fclose(filp);
                return NULL;
        }
        if (!S_ISREG(sb.st_mode)) {
                free(catalog);
+    fclose(filp);
                errno = EINVAL;
                return NULL;
        }

Please indent with tabs instead of spaces, like the other lines. All the other changes in this patch look good to me.

Nicolas

#3 lore raw

PATCH v2 1/1 libselinux: Fix RESOURCE_LEAK defects reported by coverity scan

Fixes:

libselinux/src/checkAccess.c:93: leaked_storage: Variable "user_context" going out of scope leaks the storage it points to. libselinux/src/label_db.c:286: leaked_storage: Variable "filp" going out of scope leaks the storage it points to. libselinux/src/label_db.c:291: leaked_storage: Variable "filp" going out of scope leaks the storage it points to. libselinux/src/label_file.c:405: leaked_storage: Variable "str_buf" going out of scope leaks the storage it points to. libselinux/src/load_policy.c:266: leaked_storage: Variable "names" going out of scope leaks the storage it points to. libselinux/src/selinux_config.c:183: leaked_storage: Variable "end" going out of scope leaks the storage it points to. libselinux/src/selinux_config.c:184: overwrite_var: Overwriting "end" in "end = type + strlen(type) - 1" leaks the storage that "end" points to. libselinux/src/selinux_restorecon.c:376: leaked_storage: Variable "new_entry" going out of scope leaks the storage it points to. libselinux/src/selinux_restorecon.c:855: leaked_storage: Variable "xattr_value" going out of scope leaks the storage it points to.

---
 libselinux/src/checkAccess.c        |  4 +++-
 libselinux/src/label_db.c           |  3 +++
 libselinux/src/label_file.c         |  4 +++-
 libselinux/src/load_policy.c        |  4 +++-
 libselinux/src/selinux_config.c     | 17 +++++++++--------
 libselinux/src/selinux_restorecon.c | 12 ++++++++++--
 6 files changed, 31 insertions(+), 13 deletions(-)
libselinux/src/checkAccess.c +3 -1
index 8de57477..16bfcfb6 100644
@@ -89,8 +89,10 @@ int selinux_check_passwd_access(access_vector_t requested)
 		int retval;
 
 		passwd_class = string_to_security_class("passwd");
-		if (passwd_class == 0)
+		if (passwd_class == 0) {
+			freecon(user_context);
 			return 0;
+		}
 
 		retval = security_compute_av_raw(user_context,
 						     user_context,
libselinux/src/label_db.c +3 -0
index c46d0a1d..fba96c92 100644
@@ -283,10 +283,12 @@ db_init(const struct selinux_opt *opts, unsigned nopts,
 	}
 	if (fstat(fileno(filp), &sb) < 0) {
 		free(catalog);
+		fclose(filp);
 		return NULL;
 	}
 	if (!S_ISREG(sb.st_mode)) {
 		free(catalog);
+		fclose(filp);
 		errno = EINVAL;
 		return NULL;
 	}
@@ -340,6 +342,7 @@ out_error:
 		free(spec->lr.ctx_trans);
 	}
 	free(catalog);
+	fclose(filp);
 
 	return NULL;
 }
libselinux/src/label_file.c +3 -1
index dbf51a93..b81fd552 100644
@@ -317,8 +317,10 @@ end_arch_check:
 			goto out;
 		}
 		rc = next_entry(str_buf, mmap_area, entry_len);
-		if (rc < 0)
+		if (rc < 0) {
+			free(str_buf);
 			goto out;
+		}
 
 		if (str_buf[entry_len - 1] != '\0') {
 			free(str_buf);
libselinux/src/load_policy.c +3 -1
index e9f1264a..20052beb 100644
@@ -262,8 +262,10 @@ checkbool:
 			rc = security_get_boolean_names(&names, &len);
 			if (!rc) {
 				values = malloc(sizeof(int) * len);
-				if (!values)
+				if (!values) {
+					free(names);
 					goto unmap;
+				}
 				for (i = 0; i < len; i++)
 					values[i] =
 						security_get_boolean_active(names[i]);
libselinux/src/selinux_config.c +9 -8
index 292728f3..b06cb63b 100644
@@ -177,8 +177,7 @@ static void init_selinux_config(void)
 
 			if (!strncasecmp(buf_p, SELINUXTYPETAG,
 					 sizeof(SELINUXTYPETAG) - 1)) {
-				selinux_policytype = type =
-				    strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
+				type = strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
 				if (!type)
 					return;
 				end = type + strlen(type) - 1;
@@ -187,6 +186,11 @@ static void init_selinux_config(void)
 					*end = 0;
 					end--;
 				}
+				if (setpolicytype(type) != 0) {
+					free(type);
+					return;
+				}
+				free(type);
 				continue;
 			} else if (!strncmp(buf_p, SETLOCALDEFS,
 					    sizeof(SETLOCALDEFS) - 1)) {
@@ -212,13 +216,10 @@ static void init_selinux_config(void)
 		fclose(fp);
 	}
 
-	if (!type) {
-		selinux_policytype = type = strdup(SELINUXDEFAULT);
-		if (!type)
-			return;
-	}
+	if (!selinux_policytype && setpolicytype(SELINUXDEFAULT) != 0)
+		return;
 
-	if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, type) == -1)
+	if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, selinux_policytype) == -1)
 		return;
 
 	for (i = 0; i < NEL; i++)
libselinux/src/selinux_restorecon.c +10 -2
index 0f0fd6ca..924d9538 100644
@@ -351,12 +351,19 @@ static int add_xattr_entry(const char *directory, bool delete_nonmatch,
 	new_entry->next = NULL;
 
 	new_entry->directory = strdup(directory);
-	if (!new_entry->directory)
+	if (!new_entry->directory) {
+		free(new_entry);
+		free(sha1_buf);
 		goto oom;
+	}
 
 	new_entry->digest = strdup(sha1_buf);
-	if (!new_entry->digest)
+	if (!new_entry->digest) {
+		free(new_entry->directory);
+		free(new_entry);
+		free(sha1_buf);
 		goto oom;
+	}
 
 	new_entry->result = digest_result;
 
@@ -850,6 +857,7 @@ int selinux_restorecon(const char *pathname_orig,
 
 	if (lstat(pathname, &sb) < 0) {
 		if (flags.ignore_noent && errno == ENOENT) {
+			free(xattr_value);
 			free(pathdnamer);
 			free(pathname);
 			return 0;
Signature · 1 line
2.20.1
Acked-by on v2 1/1
#4 lore raw

Re: [PATCH v2] libselinux: Fix RESOURCE_LEAK defects reported by coverity scan

Quoted 13 lines · Petr Lautrbach

Fixes:

libselinux/src/checkAccess.c:93: leaked_storage: Variable "user_context" going out of scope leaks the storage it points to. libselinux/src/label_db.c:286: leaked_storage: Variable "filp" going out of scope leaks the storage it points to. libselinux/src/label_db.c:291: leaked_storage: Variable "filp" going out of scope leaks the storage it points to. libselinux/src/label_file.c:405: leaked_storage: Variable "str_buf" going out of scope leaks the storage it points to. libselinux/src/load_policy.c:266: leaked_storage: Variable "names" going out of scope leaks the storage it points to. libselinux/src/selinux_config.c:183: leaked_storage: Variable "end" going out of scope leaks the storage it points to. libselinux/src/selinux_config.c:184: overwrite_var: Overwriting "end" in "end = type + strlen(type) - 1" leaks the storage that "end" points to. libselinux/src/selinux_restorecon.c:376: leaked_storage: Variable "new_entry" going out of scope leaks the storage it points to. libselinux/src/selinux_restorecon.c:855: leaked_storage: Variable "xattr_value" going out of scope leaks the storage it points to.

Quoted 1 line
Quoted 162 lines
---
 libselinux/src/checkAccess.c        |  4 +++-
 libselinux/src/label_db.c           |  3 +++
 libselinux/src/label_file.c         |  4 +++-
 libselinux/src/load_policy.c        |  4 +++-
 libselinux/src/selinux_config.c     | 17 +++++++++--------
 libselinux/src/selinux_restorecon.c | 12 ++++++++++--
 6 files changed, 31 insertions(+), 13 deletions(-)
libselinux/src/checkAccess.c +3 -1
index 8de57477..16bfcfb6 100644
@@ -89,8 +89,10 @@ int selinux_check_passwd_access(access_vector_t requested)
                int retval;
 
                passwd_class = string_to_security_class("passwd");
-               if (passwd_class == 0)
+               if (passwd_class == 0) {
+                       freecon(user_context);
                        return 0;
+               }
 
                retval = security_compute_av_raw(user_context,
                                                     user_context,
libselinux/src/label_db.c +3 -0
index c46d0a1d..fba96c92 100644
@@ -283,10 +283,12 @@ db_init(const struct selinux_opt *opts, unsigned nopts,
        }
        if (fstat(fileno(filp), &sb) < 0) {
                free(catalog);
+               fclose(filp);
                return NULL;
        }
        if (!S_ISREG(sb.st_mode)) {
                free(catalog);
+               fclose(filp);
                errno = EINVAL;
                return NULL;
        }
@@ -340,6 +342,7 @@ out_error:
                free(spec->lr.ctx_trans);
        }
        free(catalog);
+       fclose(filp);
 
        return NULL;
 }
libselinux/src/label_file.c +3 -1
index dbf51a93..b81fd552 100644
@@ -317,8 +317,10 @@ end_arch_check:
                        goto out;
                }
                rc = next_entry(str_buf, mmap_area, entry_len);
-               if (rc < 0)
+               if (rc < 0) {
+                       free(str_buf);
                        goto out;
+               }
 
                if (str_buf[entry_len - 1] != '\0') {
                        free(str_buf);
libselinux/src/load_policy.c +3 -1
index e9f1264a..20052beb 100644
@@ -262,8 +262,10 @@ checkbool:
                        rc = security_get_boolean_names(&names, &len);
                        if (!rc) {
                                values = malloc(sizeof(int) * len);
-                               if (!values)
+                               if (!values) {
+                                       free(names);
                                        goto unmap;
+                               }
                                for (i = 0; i < len; i++)
                                        values[i] =
                                                security_get_boolean_active(names[i]);
libselinux/src/selinux_config.c +9 -8
index 292728f3..b06cb63b 100644
@@ -177,8 +177,7 @@ static void init_selinux_config(void)
 
                        if (!strncasecmp(buf_p, SELINUXTYPETAG,
                                         sizeof(SELINUXTYPETAG) - 1)) {
-                               selinux_policytype = type =
-                                   strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
+                               type = strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
                                if (!type)
                                        return;
                                end = type + strlen(type) - 1;
@@ -187,6 +186,11 @@ static void init_selinux_config(void)
                                        *end = 0;
                                        end--;
                                }
+                               if (setpolicytype(type) != 0) {
+                                       free(type);
+                                       return;
+                               }
+                               free(type);
                                continue;
                        } else if (!strncmp(buf_p, SETLOCALDEFS,
                                            sizeof(SETLOCALDEFS) - 1)) {
@@ -212,13 +216,10 @@ static void init_selinux_config(void)
                fclose(fp);
        }
 
-       if (!type) {
-               selinux_policytype = type = strdup(SELINUXDEFAULT);
-               if (!type)
-                       return;
-       }
+       if (!selinux_policytype && setpolicytype(SELINUXDEFAULT) != 0)
+               return;
 
-       if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, type) == -1)
+       if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, selinux_policytype) == -1)
                return;
 
        for (i = 0; i < NEL; i++)
libselinux/src/selinux_restorecon.c +10 -3
index 0f0fd6ca..924d9538 100644
@@ -351,12 +351,19 @@ static int add_xattr_entry(const char *directory, bool delete_nonmatch,
        new_entry->next = NULL;
 
        new_entry->directory = strdup(directory);
-       if (!new_entry->directory)
+       if (!new_entry->directory) {
+               free(new_entry);
+               free(sha1_buf);
                goto oom;
+       }
 
        new_entry->digest = strdup(sha1_buf);
-       if (!new_entry->digest)
+       if (!new_entry->digest) {
+               free(new_entry->directory);
+               free(new_entry);
+               free(sha1_buf);
                goto oom;
+       }
 
        new_entry->result = digest_result;
 
@@ -850,6 +857,7 @@ int selinux_restorecon(const char *pathname_orig,
 
        if (lstat(pathname, &sb) < 0) {
                if (flags.ignore_noent && errno == ENOENT) {
+                       free(xattr_value);
                        free(pathdnamer);
                        free(pathname);
                        return 0;
--

2.20.1

#5 lore raw

Re: [PATCH v2] libselinux: Fix RESOURCE_LEAK defects reported by coverity scan

Quoted 15 lines · Nicolas Iooss
Quoted 13 lines · Petr Lautrbach

Fixes:

libselinux/src/checkAccess.c:93: leaked_storage: Variable "user_context" going out of scope leaks the storage it points to. libselinux/src/label_db.c:286: leaked_storage: Variable "filp" going out of scope leaks the storage it points to. libselinux/src/label_db.c:291: leaked_storage: Variable "filp" going out of scope leaks the storage it points to. libselinux/src/label_file.c:405: leaked_storage: Variable "str_buf" going out of scope leaks the storage it points to. libselinux/src/load_policy.c:266: leaked_storage: Variable "names" going out of scope leaks the storage it points to. libselinux/src/selinux_config.c:183: leaked_storage: Variable "end" going out of scope leaks the storage it points to. libselinux/src/selinux_config.c:184: overwrite_var: Overwriting "end" in "end = type + strlen(type) - 1" leaks the storage that "end" points to. libselinux/src/selinux_restorecon.c:376: leaked_storage: Variable "new_entry" going out of scope leaks the storage it points to. libselinux/src/selinux_restorecon.c:855: leaked_storage: Variable "xattr_value" going out of scope leaks the storage it points to.

Quoted 3 lines
Quoted 1 line

Merged.

Nicolas

Quoted 162 lines
Quoted 162 lines
---
 libselinux/src/checkAccess.c        |  4 +++-
 libselinux/src/label_db.c           |  3 +++
 libselinux/src/label_file.c         |  4 +++-
 libselinux/src/load_policy.c        |  4 +++-
 libselinux/src/selinux_config.c     | 17 +++++++++--------
 libselinux/src/selinux_restorecon.c | 12 ++++++++++--
 6 files changed, 31 insertions(+), 13 deletions(-)
libselinux/src/checkAccess.c +3 -1
index 8de57477..16bfcfb6 100644
@@ -89,8 +89,10 @@ int selinux_check_passwd_access(access_vector_t requested)
                int retval;
 
                passwd_class = string_to_security_class("passwd");
-               if (passwd_class == 0)
+               if (passwd_class == 0) {
+                       freecon(user_context);
                        return 0;
+               }
 
                retval = security_compute_av_raw(user_context,
                                                     user_context,
libselinux/src/label_db.c +3 -0
index c46d0a1d..fba96c92 100644
@@ -283,10 +283,12 @@ db_init(const struct selinux_opt *opts, unsigned nopts,
        }
        if (fstat(fileno(filp), &sb) < 0) {
                free(catalog);
+               fclose(filp);
                return NULL;
        }
        if (!S_ISREG(sb.st_mode)) {
                free(catalog);
+               fclose(filp);
                errno = EINVAL;
                return NULL;
        }
@@ -340,6 +342,7 @@ out_error:
                free(spec->lr.ctx_trans);
        }
        free(catalog);
+       fclose(filp);
 
        return NULL;
 }
libselinux/src/label_file.c +3 -1
index dbf51a93..b81fd552 100644
@@ -317,8 +317,10 @@ end_arch_check:
                        goto out;
                }
                rc = next_entry(str_buf, mmap_area, entry_len);
-               if (rc < 0)
+               if (rc < 0) {
+                       free(str_buf);
                        goto out;
+               }
 
                if (str_buf[entry_len - 1] != '\0') {
                        free(str_buf);
libselinux/src/load_policy.c +3 -1
index e9f1264a..20052beb 100644
@@ -262,8 +262,10 @@ checkbool:
                        rc = security_get_boolean_names(&names, &len);
                        if (!rc) {
                                values = malloc(sizeof(int) * len);
-                               if (!values)
+                               if (!values) {
+                                       free(names);
                                        goto unmap;
+                               }
                                for (i = 0; i < len; i++)
                                        values[i] =
                                                security_get_boolean_active(names[i]);
libselinux/src/selinux_config.c +9 -8
index 292728f3..b06cb63b 100644
@@ -177,8 +177,7 @@ static void init_selinux_config(void)
 
                        if (!strncasecmp(buf_p, SELINUXTYPETAG,
                                         sizeof(SELINUXTYPETAG) - 1)) {
-                               selinux_policytype = type =
-                                   strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
+                               type = strdup(buf_p + sizeof(SELINUXTYPETAG) - 1);
                                if (!type)
                                        return;
                                end = type + strlen(type) - 1;
@@ -187,6 +186,11 @@ static void init_selinux_config(void)
                                        *end = 0;
                                        end--;
                                }
+                               if (setpolicytype(type) != 0) {
+                                       free(type);
+                                       return;
+                               }
+                               free(type);
                                continue;
                        } else if (!strncmp(buf_p, SETLOCALDEFS,
                                            sizeof(SETLOCALDEFS) - 1)) {
@@ -212,13 +216,10 @@ static void init_selinux_config(void)
                fclose(fp);
        }
 
-       if (!type) {
-               selinux_policytype = type = strdup(SELINUXDEFAULT);
-               if (!type)
-                       return;
-       }
+       if (!selinux_policytype && setpolicytype(SELINUXDEFAULT) != 0)
+               return;
 
-       if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, type) == -1)
+       if (asprintf(&selinux_policyroot, "%s%s", SELINUXDIR, selinux_policytype) == -1)
                return;
 
        for (i = 0; i < NEL; i++)
libselinux/src/selinux_restorecon.c +10 -3
index 0f0fd6ca..924d9538 100644
@@ -351,12 +351,19 @@ static int add_xattr_entry(const char *directory, bool delete_nonmatch,
        new_entry->next = NULL;
 
        new_entry->directory = strdup(directory);
-       if (!new_entry->directory)
+       if (!new_entry->directory) {
+               free(new_entry);
+               free(sha1_buf);
                goto oom;
+       }
 
        new_entry->digest = strdup(sha1_buf);
-       if (!new_entry->digest)
+       if (!new_entry->digest) {
+               free(new_entry->directory);
+               free(new_entry);
+               free(sha1_buf);
                goto oom;
+       }
 
        new_entry->result = digest_result;
 
@@ -850,6 +857,7 @@ int selinux_restorecon(const char *pathname_orig,
 
        if (lstat(pathname, &sb) < 0) {
                if (flags.ignore_noent && errno == ENOENT) {
+                       free(xattr_value);
                        free(pathdnamer);
                        free(pathname);
                        return 0;
--

2.20.1

#6 lore raw

PATCH 3/3 libsemanage: Fix USE_AFTER_FREE defects reported by coverity scan

In reply to Petr Lautrbach
---
 libsemanage/src/direct_api.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)
libsemanage/src/direct_api.c +8 -13
index c58961be..8e4d116d 100644
@@ -1028,7 +1028,7 @@ static int semanage_direct_write_langext(semanage_handle_t *sh,
 
 	fp = NULL;
 
-	ret = 0;
+	return 0;
 
 cleanup:
 	if (fp != NULL) fclose(fp);
@@ -2177,7 +2177,6 @@ cleanup:
 	semanage_module_info_destroy(sh, modinfo);
 	free(modinfo);
 
-	if (fp != NULL) fclose(fp);
 	return status;
 }
 
@@ -2342,16 +2341,6 @@ static int semanage_direct_get_module_info(semanage_handle_t *sh,
 	free(tmp);
 	tmp = NULL;
 
-	if (fclose(fp) != 0) {
-		ERR(sh,
-		    "Unable to close %s module lang ext file.",
-		    (*modinfo)->name);
-		status = -1;
-		goto cleanup;
-	}
-
-	fp = NULL;
-
 	/* lookup enabled/disabled status */
 	ret = semanage_module_get_path(sh,
 				       *modinfo,
@@ -2395,7 +2384,13 @@ cleanup:
 		free(modinfos);
 	}
 
-	if (fp != NULL) fclose(fp);
+	if (fp != NULL && fclose(fp) != 0) {
+		ERR(sh,
+		    "Unable to close %s module lang ext file.",
+		    (*modinfo)->name);
+		status = -1;
+	}
+
 	return status;
 }
 
Signature · 1 line
2.20.1
#7 lore raw

Re: [PATCH 3/3] libsemanage: Fix USE_AFTER_FREE defects reported by coverity scan

Quoted 60 lines · Petr Lautrbach
---
 libsemanage/src/direct_api.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)
libsemanage/src/direct_api.c +8 -14
index c58961be..8e4d116d 100644
@@ -1028,7 +1028,7 @@ static int semanage_direct_write_langext(semanage_handle_t *sh,
 
        fp = NULL;
 
-       ret = 0;
+       return 0;
 
 cleanup:
        if (fp != NULL) fclose(fp);
@@ -2177,7 +2177,6 @@ cleanup:
        semanage_module_info_destroy(sh, modinfo);
        free(modinfo);
 
-       if (fp != NULL) fclose(fp);
        return status;
 }
 
@@ -2342,16 +2341,6 @@ static int semanage_direct_get_module_info(semanage_handle_t *sh,
        free(tmp);
        tmp = NULL;
 
-       if (fclose(fp) != 0) {
-               ERR(sh,
-                   "Unable to close %s module lang ext file.",
-                   (*modinfo)->name);
-               status = -1;
-               goto cleanup;
-       }
-
-       fp = NULL;
-
        /* lookup enabled/disabled status */
        ret = semanage_module_get_path(sh,
                                       *modinfo,
@@ -2395,7 +2384,13 @@ cleanup:
                free(modinfos);
        }
 
-       if (fp != NULL) fclose(fp);
+       if (fp != NULL && fclose(fp) != 0) {
+               ERR(sh,
+                   "Unable to close %s module lang ext file.",
+                   (*modinfo)->name);
+               status = -1;
+       }
+
        return status;
 }
 
--
Quoted 1 line

2.20.1

After reading this patch, I am wondering what the USE_AFTER_FREE defects were about. Were there real use-after-fclose bugs that are fixed by this patch? Or is this patch more about silencing Coverity's false positives due to difficulties in parsing constructions such as "fclose(fp);fp = NULL; if(f != NULL)fclose(fp);"? It would be useful if the patch description contains answers to these questions.

Otherwise the content of the patch looks good to me.

Nicolas

#8 lore raw

Re: [PATCH 3/3] libsemanage: Fix USE_AFTER_FREE defects reported by coverity scan

Quoted 62 lines · Nicolas Iooss
Quoted 61 lines · Petr Lautrbach
---
 libsemanage/src/direct_api.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)
libsemanage/src/direct_api.c +1 -1
index c58961be..8e4d116d 100644
@@ -1028,7 +1028,7 @@ static int 
 semanage_direct_write_langext(semanage_handle_t *sh,
 
        fp = NULL;
 
-       ret = 0;
+       return 0;
 
 cleanup:
        if (fp != NULL) fclose(fp);
libsemanage/src/direct_api.c +0 -11
@@ -2177,7 +2177,6 @@ cleanup:
        semanage_module_info_destroy(sh, modinfo);
        free(modinfo);
 
-       if (fp != NULL) fclose(fp);
        return status;
 }
 
@@ -2342,16 +2341,6 @@ static int 
 semanage_direct_get_module_info(semanage_handle_t *sh,
        free(tmp);
        tmp = NULL;
 
-       if (fclose(fp) != 0) {
-               ERR(sh,
-                   "Unable to close %s module lang ext file.",
-                   (*modinfo)->name);
-               status = -1;
-               goto cleanup;
-       }
-
-       fp = NULL;
-
        /* lookup enabled/disabled status */
        ret = semanage_module_get_path(sh,

*modinfo,

libsemanage/src/direct_api.c +7 -1
@@ -2395,7 +2384,13 @@ cleanup:
                free(modinfos);
        }
 
-       if (fp != NULL) fclose(fp);
+       if (fp != NULL && fclose(fp) != 0) {
+               ERR(sh,
+                   "Unable to close %s module lang ext file.",
+                   (*modinfo)->name);
+               status = -1;
+       }
+
        return status;
 }
 
Quoted 9 lines
Quoted 2 lines

--
2.20.1

After reading this patch, I am wondering what the USE_AFTER_FREE defects were about. Were there real use-after-fclose bugs that are fixed by this patch? Or is this patch more about silencing Coverity's false positives due to difficulties in parsing constructions such as "fclose(fp);fp = NULL; if(f != NULL)fclose(fp);"? It would be useful if the patch description contains answers to these questions.

Diff between scans before and after shows that it fixes at least the two following defects:

Error: USE_AFTER_FREE (CWE-672):
libsemanage-2.8/src/direct_api.c:2142: freed_arg: "fclose" frees "fp". libsemanage-2.8/src/direct_api.c:2180: use_closed_file: Calling "fclose" uses file handle "fp" after closing it.

# 2178|   	free(modinfo);
# 2179|   # 2180|-> 	if (fp != NULL) fclose(fp);
# 2181|   	return status;
# 2182|   }

Error: USE_AFTER_FREE (CWE-672):
libsemanage-2.8/src/direct_api.c:2345: freed_arg: "fclose" frees "fp". libsemanage-2.8/src/direct_api.c:2398: use_closed_file: Calling "fclose" uses file handle "fp" after closing it.

# 2396|   	}
# 2397|   # 2398|-> 	if (fp != NULL) fclose(fp);
# 2399|   	return status;
# 2400|   }

But it was supposed to fix more defects and reading it again it would be better to assign NULL to fp on line 2349 instead of moving the whole code block to cleanup.

I'll resend new set of patches with better commit messages.

Thanks!

Quoted 3 lines

Otherwise the content of the patch looks good to me.

Nicolas

#9 lore raw
In reply to Petr Lautrbach
Quoted 16 lines · Petr Lautrbach
---
 libsepol/cil/src/cil_binary.c      | 12 ++++++++++++
 libsepol/cil/src/cil_resolve_ast.c | 10 ++++++++++
 libsepol/cil/src/cil_symtab.c      |  1 +
 libsepol/src/expand.c              |  3 +++
 libsepol/src/kernel_to_cil.c       |  2 ++
 libsepol/src/kernel_to_conf.c      |  2 ++
 6 files changed, 30 insertions(+)
libsepol/cil/src/cil_binary.c +0 -0
index 0cc6eeb1..a645c95d 100644

libsepol/cil/src/cil_binary.c int cil_sensalias_to_policydb(policydb_t *pdb, struct cil_alias *cil_alias) · line 918

Quoted 7 lines
libsepol/cil/src/cil_binary.c +2 -0
@@ -912,6 +912,8 @@ int cil_sensalias_to_policydb(policydb_t *pdb, struct cil_alias *cil_alias)
        key = cil_strdup(cil_alias->datum.fqn);
        rc = symtab_insert(pdb, SYM_LEVELS, key, sepol_alias, SCOPE_DECL, 0, NULL);
        if (rc != SEPOL_OK) {
+               if (rc == 1)
+                       free(sepol_alias);
                goto exit;
        }

There is something weird here. The exit label starts with "level_datum_destroy(sepol_alias);". This is not a serious issue because level_datum_destroy() does not do anything, but after this patch, cil_sensalias_to_policydb()'s code seems to use sepol_alias after freeing it.

Should the call to level_datum_destroy(sepol_alias) be removed, or moved before free(sepol_alias)?

Thanks,
Nicolas

#10 lore raw
Quoted 31 lines · Nicolas Iooss
Quoted 16 lines · Petr Lautrbach
---
  libsepol/cil/src/cil_binary.c      | 12 ++++++++++++
  libsepol/cil/src/cil_resolve_ast.c | 10 ++++++++++
  libsepol/cil/src/cil_symtab.c      |  1 +
  libsepol/src/expand.c              |  3 +++
  libsepol/src/kernel_to_cil.c       |  2 ++
  libsepol/src/kernel_to_conf.c      |  2 ++
  6 files changed, 30 insertions(+)
libsepol/cil/src/cil_binary.c +0 -0
index 0cc6eeb1..a645c95d 100644

libsepol/cil/src/cil_binary.c int cil_sensalias_to_policydb(policydb_t *pdb, struct cil_alias *cil_alias) · line 918

Quoted 7 lines
libsepol/cil/src/cil_binary.c +2 -0
@@ -912,6 +912,8 @@ int cil_sensalias_to_policydb(policydb_t *pdb, struct cil_alias *cil_alias)
         key = cil_strdup(cil_alias->datum.fqn);
         rc = symtab_insert(pdb, SYM_LEVELS, key, sepol_alias, SCOPE_DECL, 0, NULL);
         if (rc != SEPOL_OK) {
+               if (rc == 1)
+                       free(sepol_alias);
                 goto exit;
         }

There is something weird here. The exit label starts with "level_datum_destroy(sepol_alias);". This is not a serious issue because level_datum_destroy() does not do anything, but after this patch, cil_sensalias_to_policydb()'s code seems to use sepol_alias after freeing it.

Quoted 3 lines

Should the call to level_datum_destroy(sepol_alias) be removed, or moved before free(sepol_alias)?

The real problem is the statement after the "level_datum_destroy(sepol_alias);".
The "free(sepol_level);" should be "free(sepol_alias);".
The sepol_level references a datum passed back by hashtab_search() in __cil_get_sepol_class_datum() and is not a new object.

Jim

Quoted 4 lines

Thanks,
Nicolas

Signature · 2 lines
James Carter <[email protected]>
National Security Agency
#11 lore raw
In reply to Petr Lautrbach
Quoted 15 lines · Petr Lautrbach
---
 libsepol/cil/src/cil_binary.c      | 12 ++++++++++++
 libsepol/cil/src/cil_resolve_ast.c | 10 ++++++++++
 libsepol/cil/src/cil_symtab.c      |  1 +
 libsepol/src/expand.c              |  3 +++
 libsepol/src/kernel_to_cil.c       |  2 ++
 libsepol/src/kernel_to_conf.c      |  2 ++
 6 files changed, 30 insertions(+)
libsepol/cil/src/cil_binary.c +0 -0
index 0cc6eeb1..a645c95d 100644

...

libsepol/cil/src/cil_binary.c static struct cil_list *cil_classperms_from_sepol(policydb_t *pdb, uint16_t clas · line 4814

Quoted 8 lines
libsepol/cil/src/cil_binary.c +1 -0
@@ -4797,6 +4808,7 @@ static struct cil_list *cil_classperms_from_sepol(policydb_t *pdb, uint16_t clas
        return cp_list;
 
 exit:
+       free(cp);
        cil_log(CIL_ERR,"Failed to create CIL class-permissions from sepol values\n");
        return NULL;
 }

Before free(cp), should cp->perms be destroyed with a call to cil_list_destroy(&cp->perms, CIL_FALSE)?

libsepol/cil/src/cil_resolve_ast.c int cil_resolve_sidorder(struct cil_tree_node *current, void *extra_args) · line 1528

Quoted 12 lines
libsepol/cil/src/cil_resolve_ast.c +1 -0
index fb9d9174..91187ed7 100644
@@ -1522,6 +1522,7 @@ int cil_resolve_sidorder(struct cil_tree_node *current, void *extra_args)
                rc = cil_resolve_name(current, (char *)curr->data, CIL_SYM_SIDS, extra_args, &datum);
                if (rc != SEPOL_OK) {
                        cil_log(CIL_ERR, "Failed to resolve sid %s in sidorder\n", (char *)curr->data);
+                       free(new);
                        goto exit;
                }
                cil_list_append(new, CIL_SID, datum);

Here, free(new) will not free the items that were already appended. Would cil_list_destroy(&new, CIL_FALSE) work? (I have not tested it)

libsepol/cil/src/cil_resolve_ast.c int cil_resolve_catorder(struct cil_tree_node *current, void *extra_args) · line 1598

Quoted 8 lines
libsepol/cil/src/cil_resolve_ast.c +2 -0
@@ -1591,6 +1592,8 @@ int cil_resolve_catorder(struct cil_tree_node *current, void *extra_args)
        return SEPOL_OK;
 
 exit:
+       if (new)
+               free(new);
        return rc;
 }

Same comment

libsepol/cil/src/cil_resolve_ast.c int cil_resolve_sensitivityorder(struct cil_tree_node *current, void *extra_args · line 1632

Quoted 7 lines
libsepol/cil/src/cil_resolve_ast.c +1 -0
@@ -1624,6 +1627,7 @@ int cil_resolve_sensitivityorder(struct cil_tree_node *current, void *extra_args
        return SEPOL_OK;
 
 exit:
+       free(new);
        return rc;
 }

Why is there a "if(new)" in the previous chunk and not here? As cil_list_init() fails hard when the memory allocation failed, new can never be NULL so the previous if(new) is not needed.

All the other changes in this patch looked good to me.

Nicolas

#12 lore raw
Quoted 20 lines · Nicolas Iooss
Quoted 15 lines · Petr Lautrbach
---
  libsepol/cil/src/cil_binary.c      | 12 ++++++++++++
  libsepol/cil/src/cil_resolve_ast.c | 10 ++++++++++
  libsepol/cil/src/cil_symtab.c      |  1 +
  libsepol/src/expand.c              |  3 +++
  libsepol/src/kernel_to_cil.c       |  2 ++
  libsepol/src/kernel_to_conf.c      |  2 ++
  6 files changed, 30 insertions(+)
libsepol/cil/src/cil_binary.c +0 -0
index 0cc6eeb1..a645c95d 100644

...

Quoted 3 lines
libsepol/cil/src/cil_binary.c +0 -0
@@ -4797,6 +4808,7 @@ static struct cil_list *cil_classperms_from_sepol(policydb_t *pdb, uint16_t clas
         return cp_list;
 
Quoted 8 lines

libsepol/cil/src/cil_binary.c static struct cil_list *cil_classperms_from_sepol(policydb_t *pdb, uint16_t clas · line 4814

Quoted 5 lines
libsepol/cil/src/cil_binary.c +1 -0
  exit:
+       free(cp);
         cil_log(CIL_ERR,"Failed to create CIL class-permissions from sepol values\n");
         return NULL;
  }

Before free(cp), should cp->perms be destroyed with a call to cil_list_destroy(&cp->perms, CIL_FALSE)?

Instead of "free(cp);" use "cil_destroy_classperms(cp);" That will destroy the permissions list as well.

Quoted 17 lines

libsepol/cil/src/cil_resolve_ast.c int cil_resolve_sidorder(struct cil_tree_node *current, void *extra_args) · line 1528

Quoted 13 lines
libsepol/cil/src/cil_resolve_ast.c +1 -0
index fb9d9174..91187ed7 100644
@@ -1522,6 +1522,7 @@ int cil_resolve_sidorder(struct cil_tree_node *current, void *extra_args)
                 rc = cil_resolve_name(current, (char *)curr->data, CIL_SYM_SIDS, extra_args, &datum);
                 if (rc != SEPOL_OK) {
                         cil_log(CIL_ERR, "Failed to resolve sid %s in sidorder\n", (char *)curr->data);
+                       free(new);
                         goto exit;
                 }
                 cil_list_append(new, CIL_SID, datum);

Here, free(new) will not free the items that were already appended. Would cil_list_destroy(&new, CIL_FALSE) work? (I have not tested it)

Yes, "cil_list_destroy(&new, CIL_FALSE)" is what is needed here. Using CIL_FALSE means that the datums will not be destroyed which is what we would want.

Quoted 10 lines

libsepol/cil/src/cil_resolve_ast.c int cil_resolve_catorder(struct cil_tree_node *current, void *extra_args) · line 1598

Quoted 8 lines
libsepol/cil/src/cil_resolve_ast.c +2 -0
@@ -1591,6 +1592,8 @@ int cil_resolve_catorder(struct cil_tree_node *current, void *extra_args)
         return SEPOL_OK;
 
  exit:
+       if (new)
+               free(new);
         return rc;
  }

Same comment

Should use "cil_list_destroy(&new, CIL_FALSE)" here as well.
The "if (new)" is not needed since cil_list_destroy() will return if new is NULL.

Quoted 13 lines

libsepol/cil/src/cil_resolve_ast.c int cil_resolve_sensitivityorder(struct cil_tree_node *current, void *extra_args · line 1632

Quoted 8 lines
libsepol/cil/src/cil_resolve_ast.c +1 -0
@@ -1624,6 +1627,7 @@ int cil_resolve_sensitivityorder(struct cil_tree_node *current, void *extra_args
         return SEPOL_OK;
 
  exit:
+       free(new);
         return rc;
  }

Why is there a "if(new)" in the previous chunk and not here? As cil_list_init() fails hard when the memory allocation failed, new can never be NULL so the previous if(new) is not needed.

Quoted 2 lines

All the other changes in this patch looked good to me.

Should use "cil_list_destroy(&new, CIL_FALSE)" here as well.

Quoted 3 lines

Nicolas

Signature · 2 lines
James Carter <[email protected]>
National Security Agency
#13 lore raw
In reply to Petr Lautrbach
Quoted 10 lines · Petr Lautrbach
---
  libsepol/cil/src/cil_binary.c      | 12 ++++++++++++
  libsepol/cil/src/cil_resolve_ast.c | 10 ++++++++++
  libsepol/cil/src/cil_symtab.c      |  1 +
  libsepol/src/expand.c              |  3 +++
  libsepol/src/kernel_to_cil.c       |  2 ++
  libsepol/src/kernel_to_conf.c      |  2 ++
  6 files changed, 30 insertions(+)

...

Quoted 13 lines
libsepol/src/expand.c +1 -0
index 6f1b235e..125a6809 100644
@@ -1451,6 +1451,7 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
  				new_trans->name = strdup(cur_rule->name);
  				if (!new_trans->name) {
  					ERR(state->handle, "Out of memory!");
+					free(new_trans);
  					return -1;
  				}
  				new_trans->stype = i + 1;

libsepol/src/expand.c static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r · line 1468

Quoted 8 lines
libsepol/src/expand.c +2 -0
@@ -1460,6 +1461,8 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
  				otype = calloc(1, sizeof(*otype));
  				if (!otype) {
  					ERR(state->handle, "Out of memory!");
+					free(new_trans->name);
+					free(new_trans);
  					return -1;
  				}
  				otype->otype = mapped_otype;

I believe that you need the following in the "if (rc) {" block a few lines down. free(new_trans->name);
free(new_tran);
free(otype);

Everything else that I didn't comment on in this email or my last looks good.

Signature · 2 lines
James Carter <[email protected]>
National Security Agency