Skip to contentSkip to conversation

libsepol: fix memory leak in expand.c

PATCH In review [email protected] 2 participants 4 messages Aug 8, 2016 – Aug 9, 2016 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libsepol: fix memory leak in expand.c

From: William Roberts <[email protected]>

ebitmap_set_bit() can possible allocate nodes, however, the bail early style of type_set_expand() could leave internal ebitmaps allocated but not free'd.

Modify type_set_expand() so that it free's all allocated ebitmaps before returning the error code to the calling routine.

---
 libsepol/src/expand.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
libsepol/src/expand.c +17 -13
index 4d3c623..0ad57f5 100644
@@ -2497,6 +2497,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 	unsigned int i;
 	ebitmap_t types, neg_types;
 	ebitmap_node_t *tnode;
+	int rc =-1;
 
 	ebitmap_init(&types);
 	ebitmap_init(t);
@@ -2511,7 +2512,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 				 * what's available in the type_val_to_struct mapping
 				 */
 				if (i > p->p_types.nprim - 1)
-						return -1;
+					goto err_types;
 
 				if (p->type_val_to_struct[i]->flavor ==
 				    TYPE_ATTRIB) {
@@ -2519,11 +2520,11 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 					    (&types,
 					     &p->type_val_to_struct[i]->
 					     types)) {
-						return -1;
+						goto err_types;
 					}
 				} else {
 					if (ebitmap_set_bit(&types, i, 1)) {
-						return -1;
+						goto err_types;
 					}
 				}
 			}
@@ -2531,7 +2532,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 	} else {
 		/* No expansion of attributes, just copy the set as is. */
 		if (ebitmap_cpy(&types, &set->types))
-			return -1;
+			goto err_types;
 	}
 
 	/* Now do the same thing for negset */
@@ -2543,11 +2544,11 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 				if (ebitmap_union
 				    (&neg_types,
 				     &p->type_val_to_struct[i]->types)) {
-					return -1;
+					goto err_neg;
 				}
 			} else {
 				if (ebitmap_set_bit(&neg_types, i, 1)) {
-					return -1;
+					goto err_neg;
 				}
 			}
 		}
@@ -2562,7 +2563,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 			    p->type_val_to_struct[i]->flavor == TYPE_ATTRIB)
 				continue;
 			if (ebitmap_set_bit(t, i, 1))
-				return -1;
+				goto err_neg;
 		}
 		goto out;
 	}
@@ -2571,7 +2572,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 		if (ebitmap_node_get_bit(tnode, i)
 		    && (!ebitmap_get_bit(&neg_types, i)))
 			if (ebitmap_set_bit(t, i, 1))
-				return -1;
+				goto err_neg;
 	}
 
 	if (set->flags & TYPE_COMP) {
@@ -2583,20 +2584,23 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 			}
 			if (ebitmap_get_bit(t, i)) {
 				if (ebitmap_set_bit(t, i, 0))
-					return -1;
+					goto err_neg;
 			} else {
 				if (ebitmap_set_bit(t, i, 1))
-					return -1;
+					goto err_neg;
 			}
 		}
 	}
 
-      out:
+	  out:
+	rc = 0;
 
-	ebitmap_destroy(&types);
+	  err_neg:
 	ebitmap_destroy(&neg_types);
+	  err_types:
+	ebitmap_destroy(&types);
 
-	return 0;
+	return rc;
 }
 
 static int copy_neverallow(policydb_t * dest_pol, uint32_t * typemap,
Signature · 1 line
1.9.1
#1 lore raw
Quoted 134 lines

-----Original Message-----
From: Roberts, William C
Sent: Monday, August 8, 2016 10:28 AM
To: [email protected]; [email protected]; [email protected]
Cc: Roberts, William C <[email protected]>
Subject: [PATCH] libsepol: fix memory leak in expand.c

From: William Roberts <[email protected]>

ebitmap_set_bit() can possible allocate nodes, however, the bail early style of type_set_expand() could leave internal ebitmaps allocated but not free'd.

Modify type_set_expand() so that it free's all allocated ebitmaps before returning the error code to the calling routine.

---
 libsepol/src/expand.c | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
libsepol/src/expand.c index 4d3c623..0ad57f5 renamed from libsepol/src/expand.c +0 -0

100644

libsepol/src/expand.c +1 -0
@@ -2497,6 +2497,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t,
 policydb_t * p,
 	unsigned int i;
 	ebitmap_t types, neg_types;
 	ebitmap_node_t *tnode;
+	int rc =-1;
 
 	ebitmap_init(&types);
libsepol/src/expand.c +0 -0
 	ebitmap_init(t);
@@ -2511,7 +2512,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t,
 policydb_t * p,
 				 * what's available in the type_val_to_struct

mapping

libsepol/src/expand.c +3 -3
 				 */
 				if (i > p->p_types.nprim - 1)
-						return -1;
+					goto err_types;
 
 				if (p->type_val_to_struct[i]->flavor ==
 				    TYPE_ATTRIB) {
@@ -2519,11 +2520,11 @@ int type_set_expand(type_set_t * set, ebitmap_t *
 t, policydb_t * p,
 					    (&types,
 					     &p->type_val_to_struct[i]->
 					     types)) {
-						return -1;
+						goto err_types;
 					}
 				} else {
 					if (ebitmap_set_bit(&types, i, 1)) {
-						return -1;
+						goto err_types;
 					}
 				}
libsepol/src/expand.c +1 -1
 			}
@@ -2531,7 +2532,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t,
 policydb_t * p,
 	} else {
 		/* No expansion of attributes, just copy the set as is. */
 		if (ebitmap_cpy(&types, &set->types))
-			return -1;
+			goto err_types;
 	}
 

/* Now do the same thing for negset */ @@ -2543,11 +2544,11 @@ int
type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,

libsepol/src/expand.c +3 -3
 				if (ebitmap_union
 				    (&neg_types,
 				     &p->type_val_to_struct[i]->types)) {
-					return -1;
+					goto err_neg;
 				}
 			} else {
 				if (ebitmap_set_bit(&neg_types, i, 1)) {
-					return -1;
+					goto err_neg;
 				}
 			}
 		}
@@ -2562,7 +2563,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t,
 policydb_t * p,
 			    p->type_val_to_struct[i]->flavor == TYPE_ATTRIB)
 				continue;
 			if (ebitmap_set_bit(t, i, 1))
-				return -1;
+				goto err_neg;
 		}
 		goto out;
libsepol/src/expand.c +1 -1
 	}
@@ -2571,7 +2572,7 @@ int type_set_expand(type_set_t * set, ebitmap_t * t,
 policydb_t * p,
 		if (ebitmap_node_get_bit(tnode, i)
 		    && (!ebitmap_get_bit(&neg_types, i)))
 			if (ebitmap_set_bit(t, i, 1))
-				return -1;
+				goto err_neg;
 	}
 
libsepol/src/expand.c +8 -5
 	if (set->flags & TYPE_COMP) {
@@ -2583,20 +2584,23 @@ int type_set_expand(type_set_t * set, ebitmap_t *
 t, policydb_t * p,
 			}
 			if (ebitmap_get_bit(t, i)) {
 				if (ebitmap_set_bit(t, i, 0))
-					return -1;
+					goto err_neg;
 			} else {
 				if (ebitmap_set_bit(t, i, 1))
-					return -1;
+					goto err_neg;
 			}
 		}
 	}
 
-      out:
+	  out:
+	rc = 0;
 
-	ebitmap_destroy(&types);
+	  err_neg:
 	ebitmap_destroy(&neg_types);
+	  err_types:
+	ebitmap_destroy(&types);
 
-	return 0;
+	return rc;
 }
 
Quoted 3 lines

static int copy_neverallow(policydb_t * dest_pol, uint32_t * typemap,
--
1.9.1

Sorry for the disorganization in not sending these out as a series, I didn't see the memory leak, but this applies on-top of:
[PATCH] libsepol: fix invalid read when policy file is corrupt

Bill

#2 lore raw

<snip>

Quoted 11 lines
Quoted 11 lines
libsepol/src/expand.c +5 -2
-      out:
+	  out:
+	rc = 0;
 
-	ebitmap_destroy(&types);
+	  err_neg:
 	ebitmap_destroy(&neg_types);
+	  err_types:
+	ebitmap_destroy(&types);
Quoted 3 lines

libsepol/src/expand.c int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p, · line 2604

Quoted 3 lines
libsepol/src/expand.c +1 -1
-	return 0;
+	return rc;
 }

I just noticed the indenting on the label changed, I went through the File and it has:
1. labels with 7 leading spaces
2. labels left justified

Which one is the way you want them, left justified?

Bill

#3 lore raw
Quoted 21 lines · William C

<snip>

Quoted 11 lines
Quoted 11 lines
libsepol/src/expand.c +5 -2
-      out:
+	  out:
+	rc = 0;
 
-	ebitmap_destroy(&types);
+	  err_neg:
 	ebitmap_destroy(&neg_types);
+	  err_types:
+	ebitmap_destroy(&types);
Quoted 3 lines

libsepol/src/expand.c int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p, · line 2604

Quoted 3 lines
libsepol/src/expand.c +1 -1
-	return 0;
+	return rc;
 }

I just noticed the indenting on the label changed, I went through the File and it has:
1. labels with 7 leading spaces
2. labels left justified

Quoted 1 line

Which one is the way you want them, left justified?

I think the left justified ones are from me, your patches matches with the common usage, so I applied it.

Thanks,
Jim

Quoted 10 lines

Bill

_______________________________________________
Selinux mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].

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