Skip to contentSkip to conversation

libsepol: fix invalid access of NULL on type_val_to_struct

PATCH Superseded [email protected] 3 participants 8 messages Aug 10, 2016 – Aug 11, 2016 SELinux security module

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/5 libsepol: fix invalid access of NULL on type_val_to_struct

From: William Roberts <[email protected]>

In type_set_expand:
When nprim, the table index counter, is greater than the value of initizalized entries in the type_val_to_struct[] array, detect this as invalid and return an error.

---
 libsepol/src/expand.c | 4 ++++
 1 file changed, 4 insertions(+)
libsepol/src/expand.c +4 -0
index 0ad57f5..e6d3ef1 100644
@@ -2514,6 +2514,10 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,
 				if (i > p->p_types.nprim - 1)
 					goto err_types;
 
+				if (!p->type_val_to_struct[i]) {
+					goto err_types;
+				}
+
 				if (p->type_val_to_struct[i]->flavor ==
 				    TYPE_ATTRIB) {
 					if (ebitmap_union
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 2/5 libsepol: ensure key is valid before doing search

From: William Roberts <[email protected]>

---
 libsepol/src/mls.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
libsepol/src/mls.c +7 -5
index 1e84bb7..2dc5f2b 100644
@@ -262,6 +262,7 @@ int mls_context_isvalid(const policydb_t * p, const context_struct_t * c)
 	user_datum_t *usrdatum;
 	unsigned int i, l;
 	ebitmap_node_t *cnode;
+	hashtab_key_t key;
 
 	if (!p->mls)
 		return 1;
@@ -279,11 +280,12 @@ int mls_context_isvalid(const policydb_t * p, const context_struct_t * c)
 		if (!c->range.level[l].sens
 		    || c->range.level[l].sens > p->p_levels.nprim)
 			return 0;
-		levdatum = (level_datum_t *) hashtab_search(p->p_levels.table,
-							    p->
-							    p_sens_val_to_name
-							    [c->range.level[l].
-							     sens - 1]);
+
+		key = p->p_sens_val_to_name[c->range.level[l].sens - 1];
+		if (!key)
+			return 0;
+
+		levdatum = (level_datum_t *) hashtab_search(p->p_levels.table, key);
 		if (!levdatum)
 			return 0;
 
Signature · 1 line
1.9.1
#2 lore raw

PATCH v2 3/5 ebitmap: detect invalid bitmap

In reply to [email protected]

From: William Roberts <[email protected]>

When count is 0 and the highbit is not zero, the ebitmap is not valid and the internal node is not allocated. This causes issues when routines, like mls_context_isvalid() attempt to use the ebitmap_for_each_bit() and ebitmap_node_get_bit() as they assume a highbit > 0 will have a node allocated.

---
 libsepol/src/ebitmap.c | 4 ++++
 1 file changed, 4 insertions(+)
libsepol/src/ebitmap.c +4 -0
index 58f2fc4..fe8beb8 100644
@@ -394,6 +394,10 @@ int ebitmap_read(ebitmap_t * e, void *fp)
 		     e->highbit, MAPSIZE);
 		goto bad;
 	}
+
+	if (e->highbit && !count)
+		goto bad;
+
 	l = NULL;
 	for (i = 0; i < count; i++) {
 		rc = next_entry(buf, fp, sizeof(uint32_t));
Signature · 1 line
1.9.1
#3 lore raw

PATCH v2 4/5 genfs_read: fix use heap-use-after-free

In reply to [email protected]

From: William Roberts <[email protected]>

The newc variable is calloc'd and assigned to a new owner during a loop. After the first assignment of newc to newgenfs->head, the subsequent iteration could fail before the newc is reseated with a new heap allocation pointer. When the subsequent iteration fails, the newc variable is freed. Later, an attempt it made to free the same pointer assigned to newgenfs->head.

To correct this, clear newc after every loop iteration.

---
 libsepol/src/policydb.c | 2 ++
 1 file changed, 2 insertions(+)
libsepol/src/policydb.c +2 -0
index 6a80f94..971793d 100644
@@ -2812,6 +2812,8 @@ static int genfs_read(policydb_t * p, struct policy_file *fp)
 				l->next = newc;
 			else
 				newgenfs->head = newc;
+			/* clear newc after a new owner has the pointer */
+			newc = NULL;
 		}
 	}
 
Signature · 1 line
1.9.1
#4 lore raw

PATCH v2 5/5 libsepol: fix overflow and 0 length allocations

In reply to [email protected]

From: William Roberts <[email protected]>

Throughout libsepol, values taken from sepolicy are used in places where length == 0 or length == <saturated> matter, find and fix these.

Also, correct any type mismatches noticed along the way.

---
 libsepol/src/conditional.c    |  3 ++-
 libsepol/src/context.c        | 16 +++++++++-----
 libsepol/src/context_record.c | 26 ++++++++++++----------
 libsepol/src/module.c         | 13 +++++++++++
 libsepol/src/module_to_cil.c  |  4 +++-
 libsepol/src/policydb.c       | 50 ++++++++++++++++++++++++++++++++++++++++---
 libsepol/src/private.h        |  3 +++
 7 files changed, 94 insertions(+), 21 deletions(-)
libsepol/src/conditional.c +2 -1
index ea47cdd..8680eb2 100644
@@ -589,7 +589,8 @@ int cond_read_bool(policydb_t * p,
 		goto err;
 
 	len = le32_to_cpu(buf[2]);
-
+	if (zero_or_saturated(len))
+		goto err;
 	key = malloc(len + 1);
 	if (!key)
 		goto err;
libsepol/src/context.c +11 -5
index 84dad34..39552f2 100644
@@ -10,6 +10,7 @@
 #include "context.h"
 #include "handle.h"
 #include "mls.h"
+#include "private.h"
 
 /* ----- Compatibility ---- */
 int policydb_context_isvalid(const policydb_t * p, const context_struct_t * c)
@@ -297,10 +298,18 @@ int context_from_string(sepol_handle_t * handle,
 	char *con_cpy = NULL;
 	sepol_context_t *ctx_record = NULL;
 
+	if (zero_or_saturated(con_str_len)) {
+		ERR(handle, "Invalid context length");
+		goto err;
+	}
+
 	/* sepol_context_from_string expects a NULL-terminated string */
 	con_cpy = malloc(con_str_len + 1);
-	if (!con_cpy)
-		goto omem;
+	if (!con_cpy) {
+		ERR(handle, "out of memory");
+		goto err;
+	}
+
 	memcpy(con_cpy, con_str, con_str_len);
 	con_cpy[con_str_len] = '\0';
 
@@ -315,9 +324,6 @@ int context_from_string(sepol_handle_t * handle,
 	sepol_context_free(ctx_record);
 	return STATUS_SUCCESS;
 
-      omem:
-	ERR(handle, "out of memory");
-
       err:
 	ERR(handle, "could not create context structure");
 	free(con_cpy);
libsepol/src/context_record.c +15 -11
index ac2884a..01fd2c9 100644
@@ -5,6 +5,7 @@
 
 #include "context_internal.h"
 #include "debug.h"
+#include "private.h"
 
 struct sepol_context {
 
@@ -284,17 +285,23 @@ int sepol_context_to_string(sepol_handle_t * handle,
 {
 
 	int rc;
-	const int user_sz = strlen(con->user);
-	const int role_sz = strlen(con->role);
-	const int type_sz = strlen(con->type);
-	const int mls_sz = (con->mls) ? strlen(con->mls) : 0;
-	const int total_sz = user_sz + role_sz + type_sz +
+	const size_t user_sz = strlen(con->user);
+	const size_t role_sz = strlen(con->role);
+	const size_t type_sz = strlen(con->type);
+	const size_t mls_sz = (con->mls) ? strlen(con->mls) : 0;
+	const size_t total_sz = user_sz + role_sz + type_sz +
 	    mls_sz + ((con->mls) ? 3 : 2);
 
-	char *str = (char *)malloc(total_sz + 1);
-	if (!str)
-		goto omem;
+	if (zero_or_saturated(total_sz)) {
+		ERR(handle, "invalid size");
+		goto err;
+	}
 
+	char *str = (char *)malloc(total_sz + 1);
+	if (!str) {
+		ERR(handle, "out of memory");
+		goto err;
+	}
 	if (con->mls) {
 		rc = snprintf(str, total_sz + 1, "%s:%s:%s:%s",
 			      con->user, con->role, con->type, con->mls);
@@ -314,9 +321,6 @@ int sepol_context_to_string(sepol_handle_t * handle,
 	*str_ptr = str;
 	return STATUS_SUCCESS;
 
-      omem:
-	ERR(handle, "out of memory");
-
       err:
 	ERR(handle, "could not convert context to string");
 	free(str);
libsepol/src/module.c +13 -0
index 1665ede..f25df95 100644
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <inttypes.h>
 
 #define SEPOL_PACKAGE_SECTION_FC 0xf97cff90
 #define SEPOL_PACKAGE_SECTION_SEUSER 0x97cff91
@@ -793,6 +794,12 @@ int sepol_module_package_info(struct sepol_policy_file *spf, int *type,
 				goto cleanup;
 			}
 			len = le32_to_cpu(buf[0]);
+			if (zero_or_saturated(len)) {
+				ERR(file->handle,
+				    "invalid module name length: 0x%"PRIx32,
+				    len);
+				goto cleanup;
+			}
 			*name = malloc(len + 1);
 			if (!*name) {
 				ERR(file->handle, "out of memory");
@@ -814,6 +821,12 @@ int sepol_module_package_info(struct sepol_policy_file *spf, int *type,
 				goto cleanup;
 			}
 			len = le32_to_cpu(buf[0]);
+			if (zero_or_saturated(len)) {
+				ERR(file->handle,
+				    "invalid module version length: 0x%"PRIx32,
+				    len);
+				goto cleanup;
+			}
 			*version = malloc(len + 1);
 			if (!*version) {
 				ERR(file->handle, "out of memory");
libsepol/src/module_to_cil.c +3 -1
index 36f3b7d..fc65019 100644
@@ -47,6 +47,8 @@
 #include <sepol/policydb/services.h>
 #include <sepol/policydb/util.h>
 
+#include "private.h"
+
 #ifdef __GNUC__
 #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
 #else
@@ -124,7 +126,7 @@ static int get_line(char **start, char *end, char **line)
 
 	for (len = 0; p < end && *p != '\n' && *p != '\0'; p++, len++);
 
-	if (len == 0) {
+	if (zero_or_saturated(len)) {
 		rc = 0;
 		goto exit;
 	}
libsepol/src/policydb.c +47 -3

165 lines not on this page · raw message

libsepol/src/private.h +3 -0
index 9c700c9..0beb4d4 100644
@@ -45,6 +45,9 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
+#define is_saturated(x) (x == (typeof(x))-1)
+#define zero_or_saturated(x) ((x == 0) || is_saturated(x))
+
 /* Policy compatibility information. */
 struct policydb_compat_info {
 	unsigned int type;
Signature · 1 line
1.9.1
#5 lore raw

Re: [PATCH v2 5/5] libsepol: fix overflow and 0 length allocations

Quoted 110 lines · On 08/10/2016 06:36 PM, [email protected] wrote:

From: William Roberts <[email protected]>

Throughout libsepol, values taken from sepolicy are used in places where length == 0 or length == <saturated> matter, find and fix these.

Also, correct any type mismatches noticed along the way.

---
 libsepol/src/conditional.c    |  3 ++-
 libsepol/src/context.c        | 16 +++++++++-----
 libsepol/src/context_record.c | 26 ++++++++++++----------
 libsepol/src/module.c         | 13 +++++++++++
 libsepol/src/module_to_cil.c  |  4 +++-
 libsepol/src/policydb.c       | 50 ++++++++++++++++++++++++++++++++++++++++---
 libsepol/src/private.h        |  3 +++
 7 files changed, 94 insertions(+), 21 deletions(-)
libsepol/src/conditional.c +2 -1
index ea47cdd..8680eb2 100644
@@ -589,7 +589,8 @@ int cond_read_bool(policydb_t * p,
 		goto err;
 
 	len = le32_to_cpu(buf[2]);
-
+	if (zero_or_saturated(len))
+		goto err;
 	key = malloc(len + 1);
 	if (!key)
 		goto err;
libsepol/src/context.c +11 -5
index 84dad34..39552f2 100644
@@ -10,6 +10,7 @@
 #include "context.h"
 #include "handle.h"
 #include "mls.h"
+#include "private.h"
 
 /* ----- Compatibility ---- */
 int policydb_context_isvalid(const policydb_t * p, const context_struct_t * c)
@@ -297,10 +298,18 @@ int context_from_string(sepol_handle_t * handle,
 	char *con_cpy = NULL;
 	sepol_context_t *ctx_record = NULL;
 
+	if (zero_or_saturated(con_str_len)) {
+		ERR(handle, "Invalid context length");
+		goto err;
+	}
+
 	/* sepol_context_from_string expects a NULL-terminated string */
 	con_cpy = malloc(con_str_len + 1);
-	if (!con_cpy)
-		goto omem;
+	if (!con_cpy) {
+		ERR(handle, "out of memory");
+		goto err;
+	}
+
 	memcpy(con_cpy, con_str, con_str_len);
 	con_cpy[con_str_len] = '\0';
 
@@ -315,9 +324,6 @@ int context_from_string(sepol_handle_t * handle,
 	sepol_context_free(ctx_record);
 	return STATUS_SUCCESS;
 
-      omem:
-	ERR(handle, "out of memory");
-
       err:
 	ERR(handle, "could not create context structure");
 	free(con_cpy);
libsepol/src/context_record.c +9 -8
index ac2884a..01fd2c9 100644
@@ -5,6 +5,7 @@
 
 #include "context_internal.h"
 #include "debug.h"
+#include "private.h"
 
 struct sepol_context {
 
@@ -284,17 +285,23 @@ int sepol_context_to_string(sepol_handle_t * handle,
 {
 
 	int rc;
-	const int user_sz = strlen(con->user);
-	const int role_sz = strlen(con->role);
-	const int type_sz = strlen(con->type);
-	const int mls_sz = (con->mls) ? strlen(con->mls) : 0;
-	const int total_sz = user_sz + role_sz + type_sz +
+	const size_t user_sz = strlen(con->user);
+	const size_t role_sz = strlen(con->role);
+	const size_t type_sz = strlen(con->type);
+	const size_t mls_sz = (con->mls) ? strlen(con->mls) : 0;
+	const size_t total_sz = user_sz + role_sz + type_sz +
 	    mls_sz + ((con->mls) ? 3 : 2);
 
-	char *str = (char *)malloc(total_sz + 1);
-	if (!str)
-		goto omem;
+	if (zero_or_saturated(total_sz)) {
+		ERR(handle, "invalid size");
+		goto err;

libsepol/src/context_record.c int sepol_context_to_string(sepol_handle_t * handle, · line 307

Quoted 10 lines
libsepol/src/context_record.c +6 -0
+	}
 
+	char *str = (char *)malloc(total_sz + 1);
+	if (!str) {
+		ERR(handle, "out of memory");
+		goto err;
+	}
 	if (con->mls) {
 		rc = snprintf(str, total_sz + 1, "%s:%s:%s:%s",
 			      con->user, con->role, con->type, con->mls);

I get the following errors when compiling:

context_record.c: In function ‘sepol_context_to_string’:
context_record.c:308:21: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]

   if (rc < 0 || (rc >= total_sz + 1)) {
                     ^~
context_record.c:315:21: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
   if (rc < 0 || (rc >= total_sz + 1)) {
                     ^~

context_record.c:326:2: error: ‘str’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
free(str);
^~~~~~~~~

Jim

Quoted 273 lines
libsepol/src/context_record.c +0 -3
@@ -314,9 +321,6 @@ int sepol_context_to_string(sepol_handle_t * handle,
 	*str_ptr = str;
 	return STATUS_SUCCESS;
 
-      omem:
-	ERR(handle, "out of memory");
-
       err:
 	ERR(handle, "could not convert context to string");
 	free(str);
libsepol/src/module.c +13 -0
index 1665ede..f25df95 100644
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <inttypes.h>
 
 #define SEPOL_PACKAGE_SECTION_FC 0xf97cff90
 #define SEPOL_PACKAGE_SECTION_SEUSER 0x97cff91
@@ -793,6 +794,12 @@ int sepol_module_package_info(struct sepol_policy_file *spf, int *type,
 				goto cleanup;
 			}
 			len = le32_to_cpu(buf[0]);
+			if (zero_or_saturated(len)) {
+				ERR(file->handle,
+				    "invalid module name length: 0x%"PRIx32,
+				    len);
+				goto cleanup;
+			}
 			*name = malloc(len + 1);
 			if (!*name) {
 				ERR(file->handle, "out of memory");
@@ -814,6 +821,12 @@ int sepol_module_package_info(struct sepol_policy_file *spf, int *type,
 				goto cleanup;
 			}
 			len = le32_to_cpu(buf[0]);
+			if (zero_or_saturated(len)) {
+				ERR(file->handle,
+				    "invalid module version length: 0x%"PRIx32,
+				    len);
+				goto cleanup;
+			}
 			*version = malloc(len + 1);
 			if (!*version) {
 				ERR(file->handle, "out of memory");
libsepol/src/module_to_cil.c +3 -1
index 36f3b7d..fc65019 100644
@@ -47,6 +47,8 @@
 #include <sepol/policydb/services.h>
 #include <sepol/policydb/util.h>
 
+#include "private.h"
+
 #ifdef __GNUC__
 #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
 #else
@@ -124,7 +126,7 @@ static int get_line(char **start, char *end, char **line)
 
 	for (len = 0; p < end && *p != '\n' && *p != '\0'; p++, len++);
 
-	if (len == 0) {
+	if (zero_or_saturated(len)) {
 		rc = 0;
 		goto exit;
 	}
libsepol/src/policydb.c +47 -3
index 971793d..2267387 100644
@@ -1911,6 +1911,9 @@ static int perm_read(policydb_t * p
 		goto bad;
 
 	len = le32_to_cpu(buf[0]);
+	if (zero_or_saturated(len))
+		goto bad;
+
 	perdatum->s.value = le32_to_cpu(buf[1]);
 
 	key = malloc(len + 1);
@@ -1949,6 +1952,9 @@ static int common_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
 		goto bad;
 
 	len = le32_to_cpu(buf[0]);
+	if (zero_or_saturated(len))
+		goto bad;
+
 	comdatum->s.value = le32_to_cpu(buf[1]);
 
 	if (symtab_init(&comdatum->permissions, PERM_SYMTAB_SIZE))
@@ -2092,7 +2098,11 @@ static int class_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
 		goto bad;
 
 	len = le32_to_cpu(buf[0]);
+	if (zero_or_saturated(len))
+		goto bad;
 	len2 = le32_to_cpu(buf[1]);
+	if (is_saturated(len2))
+		goto bad;
 	cladatum->s.value = le32_to_cpu(buf[2]);
 
 	if (symtab_init(&cladatum->permissions, PERM_SYMTAB_SIZE))
@@ -2199,6 +2209,9 @@ static int role_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
 		goto bad;
 
 	len = le32_to_cpu(buf[0]);
+	if (zero_or_saturated(len))
+		goto bad;
+
 	role->s.value = le32_to_cpu(buf[1]);
 	if (policydb_has_boundary_feature(p))
 		role->bounds = le32_to_cpu(buf[2]);
@@ -2287,6 +2300,9 @@ static int type_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
 		goto bad;
 
 	len = le32_to_cpu(buf[pos]);
+	if (zero_or_saturated(len))
+		goto bad;
+
 	typdatum->s.value = le32_to_cpu(buf[++pos]);
 	if (policydb_has_boundary_feature(p)) {
 		uint32_t properties;
@@ -2556,6 +2572,9 @@ static int ocontext_read_xen(struct policydb_compat_info *info,
 				if (rc < 0)
 					return -1;
 				len = le32_to_cpu(buf[0]);
+				if (zero_or_saturated(len))
+					return -1;
+
 				c->u.name = malloc(len + 1);
 				if (!c->u.name)
 					return -1;
@@ -2618,6 +2637,8 @@ static int ocontext_read_selinux(struct policydb_compat_info *info,
 				if (rc < 0)
 					return -1;
 				len = le32_to_cpu(buf[0]);
+				if (zero_or_saturated(len))
+					return -1;
 				c->u.name = malloc(len + 1);
 				if (!c->u.name)
 					return -1;
@@ -2659,6 +2680,8 @@ static int ocontext_read_selinux(struct policydb_compat_info *info,
 					return -1;
 				c->v.behavior = le32_to_cpu(buf[0]);
 				len = le32_to_cpu(buf[1]);
+				if (zero_or_saturated(len))
+					return -1;
 				c->u.name = malloc(len + 1);
 				if (!c->u.name)
 					return -1;
@@ -2719,7 +2742,7 @@ static int genfs_read(policydb_t * p, struct policy_file *fp)
 	uint32_t buf[1];
 	size_t nel, nel2, len, len2;
 	genfs_t *genfs_p, *newgenfs, *genfs;
-	unsigned int i, j;
+	size_t i, j;
 	ocontext_t *l, *c, *newc = NULL;
 	int rc;
 
@@ -2733,6 +2756,8 @@ static int genfs_read(policydb_t * p, struct policy_file *fp)
 		if (rc < 0)
 			goto bad;
 		len = le32_to_cpu(buf[0]);
+		if (zero_or_saturated(len))
+			goto bad;
 		newgenfs = calloc(1, sizeof(genfs_t));
 		if (!newgenfs)
 			goto bad;
@@ -2778,6 +2803,8 @@ static int genfs_read(policydb_t * p, struct policy_file *fp)
 			if (rc < 0)
 				goto bad;
 			len = le32_to_cpu(buf[0]);
+			if (zero_or_saturated(len))
+				goto bad;
 			newc->u.name = malloc(len + 1);
 			if (!newc->u.name) {
 				goto bad;
@@ -2877,6 +2904,9 @@ static int user_read(policydb_t * p, hashtab_t h, struct policy_file *fp)
 		goto bad;
 
 	len = le32_to_cpu(buf[0]);
+	if (zero_or_saturated(len))
+		goto bad;
+
 	usrdatum->s.value = le32_to_cpu(buf[1]);
 	if (policydb_has_boundary_feature(p))
 		usrdatum->bounds = le32_to_cpu(buf[2]);
@@ -2960,6 +2990,9 @@ static int sens_read(policydb_t * p
 		goto bad;
 
 	len = le32_to_cpu(buf[0]);
+	if (zero_or_saturated(len))
+		goto bad;
+
 	levdatum->isalias = le32_to_cpu(buf[1]);
 
 	key = malloc(len + 1);
@@ -3003,6 +3036,9 @@ static int cat_read(policydb_t * p
 		goto bad;
 
 	len = le32_to_cpu(buf[0]);
+	if(zero_or_saturated(len))
+		goto bad;
+
 	catdatum->s.value = le32_to_cpu(buf[1]);
 	catdatum->isalias = le32_to_cpu(buf[2]);
 
@@ -3339,6 +3375,8 @@ static int filename_trans_rule_read(filename_trans_rule_t ** r, struct policy_fi
 			return -1;
 
 		len = le32_to_cpu(buf[0]);
+		if (zero_or_saturated(len))
+			return -1;
 
 		ftr->name = malloc(len + 1);
 		if (!ftr->name)
@@ -3580,6 +3618,8 @@ static int scope_read(policydb_t * p, int symnum, struct policy_file *fp)
 	if (rc < 0)
 		goto cleanup;
 	key_len = le32_to_cpu(buf[0]);
+	if (zero_or_saturated(key_len))
+		goto cleanup;
 	key = malloc(key_len + 1);
 	if (!key)
 		goto cleanup;
@@ -3664,8 +3704,8 @@ int policydb_read(policydb_t * p, struct policy_file *fp, unsigned verbose)
 	}
 
 	len = buf[1];
-	if (len > POLICYDB_STRING_MAX_LENGTH) {
-		ERR(fp->handle, "policydb string length too long ");
+	if (len == 0 || len > POLICYDB_STRING_MAX_LENGTH) {
+		ERR(fp->handle, "policydb string length %s ", len ? "too long" : "zero");
 		return POLICYDB_ERROR;
 	}
 
@@ -3798,6 +3838,8 @@ int policydb_read(policydb_t * p, struct policy_file *fp, unsigned verbose)
 			goto bad;
 		}
 		len = le32_to_cpu(buf[0]);
+		if (zero_or_saturated(len))
+			goto bad;
 		if ((p->name = malloc(len + 1)) == NULL) {
 			goto bad;
 		}
@@ -3809,6 +3851,8 @@ int policydb_read(policydb_t * p, struct policy_file *fp, unsigned verbose)
 			goto bad;
 		}
 		len = le32_to_cpu(buf[0]);
+		if (zero_or_saturated(len))
+			goto bad;
 		if ((p->version = malloc(len + 1)) == NULL) {
 			goto bad;
 		}
libsepol/src/private.h +3 -0
index 9c700c9..0beb4d4 100644
@@ -45,6 +45,9 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
+#define is_saturated(x) (x == (typeof(x))-1)
+#define zero_or_saturated(x) ((x == 0) || is_saturated(x))
+
 /* Policy compatibility information. */
 struct policydb_compat_info {
 	unsigned int type;
Signature · 2 lines
James Carter <[email protected]>
National Security Agency
#6 lore raw

Re: [PATCH v2 5/5] libsepol: fix overflow and 0 length allocations

Quoted 139 lines · James Carter
Quoted 123 lines · On 08/10/2016 06:36 PM, [email protected] wrote:

From: William Roberts <[email protected]>

Throughout libsepol, values taken from sepolicy are used in places where length == 0 or length == <saturated> matter, find and fix these.

Also, correct any type mismatches noticed along the way.

---
 libsepol/src/conditional.c    |  3 ++-
 libsepol/src/context.c        | 16 +++++++++-----
 libsepol/src/context_record.c | 26 ++++++++++++----------
 libsepol/src/module.c         | 13 +++++++++++
 libsepol/src/module_to_cil.c  |  4 +++-
 libsepol/src/policydb.c       | 50 ++++++++++++++++++++++++++++++
++++++++++---
 libsepol/src/private.h        |  3 +++
 7 files changed, 94 insertions(+), 21 deletions(-)
libsepol/src/conditional.c +2 -1
index ea47cdd..8680eb2 100644
@@ -589,7 +589,8 @@ int cond_read_bool(policydb_t * p,
                goto err;
 
        len = le32_to_cpu(buf[2]);
-
+       if (zero_or_saturated(len))
+               goto err;
        key = malloc(len + 1);
        if (!key)
                goto err;
libsepol/src/context.c +1 -0
index 84dad34..39552f2 100644
@@ -10,6 +10,7 @@
 #include "context.h"
 #include "handle.h"
 #include "mls.h"
+#include "private.h"
 
 /* ----- Compatibility ---- */
 int policydb_context_isvalid(const policydb_t * p, const

context_struct_t * c)

libsepol/src/context.c +10 -5
@@ -297,10 +298,18 @@ int context_from_string(sepol_handle_t * handle,
        char *con_cpy = NULL;
        sepol_context_t *ctx_record = NULL;
 
+       if (zero_or_saturated(con_str_len)) {
+               ERR(handle, "Invalid context length");
+               goto err;
+       }
+
        /* sepol_context_from_string expects a NULL-terminated string */
        con_cpy = malloc(con_str_len + 1);
-       if (!con_cpy)
-               goto omem;
+       if (!con_cpy) {
+               ERR(handle, "out of memory");
+               goto err;
+       }
+
        memcpy(con_cpy, con_str, con_str_len);
        con_cpy[con_str_len] = '\0';
 
@@ -315,9 +324,6 @@ int context_from_string(sepol_handle_t * handle,
        sepol_context_free(ctx_record);
        return STATUS_SUCCESS;
 
-      omem:
-       ERR(handle, "out of memory");
-
       err:
        ERR(handle, "could not create context structure");
        free(con_cpy);
libsepol/src/context_record. renamed from libsepol/src/context_record.c +0 -0

c
index ac2884a..01fd2c9 100644

libsepol/src/context_record.c +15 -8
@@ -5,6 +5,7 @@
 
 #include "context_internal.h"
 #include "debug.h"
+#include "private.h"
 
 struct sepol_context {
 
@@ -284,17 +285,23 @@ int sepol_context_to_string(sepol_handle_t *
 handle,
 {
 
        int rc;
-       const int user_sz = strlen(con->user);
-       const int role_sz = strlen(con->role);
-       const int type_sz = strlen(con->type);
-       const int mls_sz = (con->mls) ? strlen(con->mls) : 0;
-       const int total_sz = user_sz + role_sz + type_sz +
+       const size_t user_sz = strlen(con->user);
+       const size_t role_sz = strlen(con->role);
+       const size_t type_sz = strlen(con->type);
+       const size_t mls_sz = (con->mls) ? strlen(con->mls) : 0;
+       const size_t total_sz = user_sz + role_sz + type_sz +
            mls_sz + ((con->mls) ? 3 : 2);
 
-       char *str = (char *)malloc(total_sz + 1);
-       if (!str)
-               goto omem;
+       if (zero_or_saturated(total_sz)) {
+               ERR(handle, "invalid size");
+               goto err;
+       }
 
+       char *str = (char *)malloc(total_sz + 1);
+       if (!str) {
+               ERR(handle, "out of memory");
+               goto err;
+       }
        if (con->mls) {
                rc = snprintf(str, total_sz + 1, "%s:%s:%s:%s",
Quoted 2 lines
                              con->user, con->role, con->type, con->mls);

I get the following errors when compiling:

context_record.c: In function ‘sepol_context_to_string’:
context_record.c:308:21: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]

   if (rc < 0 || (rc >= total_sz + 1)) {
                     ^~
context_record.c:315:21: error: comparison between signed and unsigned
integer expressions [-Werror=sign-compare]
   if (rc < 0 || (rc >= total_sz + 1)) {
                     ^~
Quoted 5 lines

context_record.c:326:2: error: ‘str’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
free(str);
^~~~~~~~~

Interesting, i'm not seeing these, ill roll these into v3 and see if I can reproduce to make sure they
don't come back.

Quoted 310 lines

Jim

(quoted diff) +0 -0
@@ -314,9 +321,6 @@ int sepol_context_to_string(sepol_handle_t * handle,
 >         *str_ptr = str;
 >         return STATUS_SUCCESS;
Quoted 284 lines
libsepol/src/context_record.c +0 -3
-      omem:
-       ERR(handle, "out of memory");
-
       err:
        ERR(handle, "could not convert context to string");
        free(str);
libsepol/src/module.c +7 -0
index 1665ede..f25df95 100644
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <inttypes.h>
 
 #define SEPOL_PACKAGE_SECTION_FC 0xf97cff90
 #define SEPOL_PACKAGE_SECTION_SEUSER 0x97cff91
@@ -793,6 +794,12 @@ int sepol_module_package_info(struct
 sepol_policy_file *spf, int *type,
                                goto cleanup;
                        }
                        len = le32_to_cpu(buf[0]);
+                       if (zero_or_saturated(len)) {
+                               ERR(file->handle,
+                                   "invalid module name length:
 0x%"PRIx32,
+                                   len);
+                               goto cleanup;
+                       }
                        *name = malloc(len + 1);
                        if (!*name) {
                                ERR(file->handle, "out of memory");
libsepol/src/module.c +6 -0
@@ -814,6 +821,12 @@ int sepol_module_package_info(struct
 sepol_policy_file *spf, int *type,
                                goto cleanup;
                        }
                        len = le32_to_cpu(buf[0]);
+                       if (zero_or_saturated(len)) {
+                               ERR(file->handle,
+                                   "invalid module version length:
 0x%"PRIx32,
+                                   len);
+                               goto cleanup;
+                       }
                        *version = malloc(len + 1);
                        if (!*version) {
                                ERR(file->handle, "out of memory");
libsepol/src/module_to_cil.c +3 -1
index 36f3b7d..fc65019 100644
@@ -47,6 +47,8 @@
 #include <sepol/policydb/services.h>
 #include <sepol/policydb/util.h>
 
+#include "private.h"
+
 #ifdef __GNUC__
 #  define UNUSED(x) UNUSED_ ## x __attribute__((__unused__))
 #else
@@ -124,7 +126,7 @@ static int get_line(char **start, char *end, char
 **line)
 
        for (len = 0; p < end && *p != '\n' && *p != '\0'; p++, len++);
 
-       if (len == 0) {
+       if (zero_or_saturated(len)) {
                rc = 0;
                goto exit;
        }
libsepol/src/policydb.c +6 -0
index 971793d..2267387 100644
@@ -1911,6 +1911,9 @@ static int perm_read(policydb_t * p
                goto bad;
 
        len = le32_to_cpu(buf[0]);
+       if (zero_or_saturated(len))
+               goto bad;
+
        perdatum->s.value = le32_to_cpu(buf[1]);
 
        key = malloc(len + 1);
@@ -1949,6 +1952,9 @@ static int common_read(policydb_t * p, hashtab_t h,
 struct policy_file *fp)
                goto bad;
 
        len = le32_to_cpu(buf[0]);
+       if (zero_or_saturated(len))
+               goto bad;
+
        comdatum->s.value = le32_to_cpu(buf[1]);
 
        if (symtab_init(&comdatum->permissions, PERM_SYMTAB_SIZE))
libsepol/src/policydb.c +4 -0
@@ -2092,7 +2098,11 @@ static int class_read(policydb_t * p, hashtab_t h,
 struct policy_file *fp)
                goto bad;
 
        len = le32_to_cpu(buf[0]);
+       if (zero_or_saturated(len))
+               goto bad;
        len2 = le32_to_cpu(buf[1]);
+       if (is_saturated(len2))
+               goto bad;
        cladatum->s.value = le32_to_cpu(buf[2]);
 
        if (symtab_init(&cladatum->permissions, PERM_SYMTAB_SIZE))
libsepol/src/policydb.c +3 -0
@@ -2199,6 +2209,9 @@ static int role_read(policydb_t * p, hashtab_t h,
 struct policy_file *fp)
                goto bad;
 
        len = le32_to_cpu(buf[0]);
+       if (zero_or_saturated(len))
+               goto bad;
+
        role->s.value = le32_to_cpu(buf[1]);
        if (policydb_has_boundary_feature(p))
                role->bounds = le32_to_cpu(buf[2]);
libsepol/src/policydb.c +3 -0
@@ -2287,6 +2300,9 @@ static int type_read(policydb_t * p, hashtab_t h,
 struct policy_file *fp)
                goto bad;
 
        len = le32_to_cpu(buf[pos]);
+       if (zero_or_saturated(len))
+               goto bad;
+
        typdatum->s.value = le32_to_cpu(buf[++pos]);
        if (policydb_has_boundary_feature(p)) {
                uint32_t properties;
libsepol/src/policydb.c +3 -0
@@ -2556,6 +2572,9 @@ static int ocontext_read_xen(struct
 policydb_compat_info *info,
                                if (rc < 0)
                                        return -1;
                                len = le32_to_cpu(buf[0]);
+                               if (zero_or_saturated(len))
+                                       return -1;
+
                                c->u.name = malloc(len + 1);
                                if (!c->u.name)
                                        return -1;
libsepol/src/policydb.c +2 -0
@@ -2618,6 +2637,8 @@ static int ocontext_read_selinux(struct
 policydb_compat_info *info,
                                if (rc < 0)
                                        return -1;
                                len = le32_to_cpu(buf[0]);
+                               if (zero_or_saturated(len))
+                                       return -1;
                                c->u.name = malloc(len + 1);
                                if (!c->u.name)
                                        return -1;
libsepol/src/policydb.c +2 -0
@@ -2659,6 +2680,8 @@ static int ocontext_read_selinux(struct
 policydb_compat_info *info,
                                        return -1;
                                c->v.behavior = le32_to_cpu(buf[0]);
                                len = le32_to_cpu(buf[1]);
+                               if (zero_or_saturated(len))
+                                       return -1;
                                c->u.name = malloc(len + 1);
                                if (!c->u.name)
                                        return -1;
libsepol/src/policydb.c +3 -1
@@ -2719,7 +2742,7 @@ static int genfs_read(policydb_t * p, struct
 policy_file *fp)
        uint32_t buf[1];
        size_t nel, nel2, len, len2;
        genfs_t *genfs_p, *newgenfs, *genfs;
-       unsigned int i, j;
+       size_t i, j;
        ocontext_t *l, *c, *newc = NULL;
        int rc;
@@ -2733,6 +2756,8 @@ static int genfs_read(policydb_t * p, struct
 policy_file *fp)
                if (rc < 0)
                        goto bad;
                len = le32_to_cpu(buf[0]);
+               if (zero_or_saturated(len))
+                       goto bad;
                newgenfs = calloc(1, sizeof(genfs_t));
                if (!newgenfs)
                        goto bad;
libsepol/src/policydb.c +2 -0
@@ -2778,6 +2803,8 @@ static int genfs_read(policydb_t * p, struct
 policy_file *fp)
                        if (rc < 0)
                                goto bad;
                        len = le32_to_cpu(buf[0]);
+                       if (zero_or_saturated(len))
+                               goto bad;
                        newc->u.name = malloc(len + 1);
                        if (!newc->u.name) {
                                goto bad;
libsepol/src/policydb.c +3 -0
@@ -2877,6 +2904,9 @@ static int user_read(policydb_t * p, hashtab_t h,
 struct policy_file *fp)
                goto bad;
 
        len = le32_to_cpu(buf[0]);
+       if (zero_or_saturated(len))
+               goto bad;
+
        usrdatum->s.value = le32_to_cpu(buf[1]);
        if (policydb_has_boundary_feature(p))
                usrdatum->bounds = le32_to_cpu(buf[2]);
libsepol/src/policydb.c +8 -0
@@ -2960,6 +2990,9 @@ static int sens_read(policydb_t * p
                goto bad;
 
        len = le32_to_cpu(buf[0]);
+       if (zero_or_saturated(len))
+               goto bad;
+
        levdatum->isalias = le32_to_cpu(buf[1]);
 
        key = malloc(len + 1);
@@ -3003,6 +3036,9 @@ static int cat_read(policydb_t * p
                goto bad;
 
        len = le32_to_cpu(buf[0]);
+       if(zero_or_saturated(len))
+               goto bad;
+
        catdatum->s.value = le32_to_cpu(buf[1]);
        catdatum->isalias = le32_to_cpu(buf[2]);
 
@@ -3339,6 +3375,8 @@ static int filename_trans_rule_read(filename_trans_rule_t
 ** r, struct policy_fi
                        return -1;
 
                len = le32_to_cpu(buf[0]);
+               if (zero_or_saturated(len))
+                       return -1;
 
                ftr->name = malloc(len + 1);
                if (!ftr->name)
libsepol/src/policydb.c +2 -0
@@ -3580,6 +3618,8 @@ static int scope_read(policydb_t * p, int symnum,
 struct policy_file *fp)
        if (rc < 0)
                goto cleanup;
        key_len = le32_to_cpu(buf[0]);
+       if (zero_or_saturated(key_len))
+               goto cleanup;
        key = malloc(key_len + 1);
        if (!key)
                goto cleanup;
libsepol/src/policydb.c +2 -2
@@ -3664,8 +3704,8 @@ int policydb_read(policydb_t * p, struct
 policy_file *fp, unsigned verbose)
        }
 
        len = buf[1];
-       if (len > POLICYDB_STRING_MAX_LENGTH) {
-               ERR(fp->handle, "policydb string length too long ");
+       if (len == 0 || len > POLICYDB_STRING_MAX_LENGTH) {
+               ERR(fp->handle, "policydb string length %s ", len ? "too
 long" : "zero");
                return POLICYDB_ERROR;
        }
libsepol/src/policydb.c +2 -0
@@ -3798,6 +3838,8 @@ int policydb_read(policydb_t * p, struct
 policy_file *fp, unsigned verbose)
                        goto bad;
                }
                len = le32_to_cpu(buf[0]);
+               if (zero_or_saturated(len))
+                       goto bad;
                if ((p->name = malloc(len + 1)) == NULL) {
                        goto bad;
                }
libsepol/src/policydb.c +2 -0
@@ -3809,6 +3851,8 @@ int policydb_read(policydb_t * p, struct
 policy_file *fp, unsigned verbose)
                        goto bad;
                }
                len = le32_to_cpu(buf[0]);
+               if (zero_or_saturated(len))
+                       goto bad;
                if ((p->version = malloc(len + 1)) == NULL) {
                        goto bad;
                }
libsepol/src/private.h +0 -0
index 9c700c9..0beb4d4 100644

libsepol/src/private.h line 53

Quoted 9 lines
libsepol/src/private.h +3 -0
@@ -45,6 +45,9 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
+#define is_saturated(x) (x == (typeof(x))-1)
+#define zero_or_saturated(x) ((x == 0) || is_saturated(x))
+
 /* Policy compatibility information. */
 struct policydb_compat_info {
        unsigned int type;

--
James Carter <[email protected]>
National Security Agency
_______________________________________________
Seandroid-list mailing list [email protected]
To unsubscribe, send email to [email protected]. To get help, send an email containing "help" to [email protected].

Signature · 3 lines
Respectfully,

William C Roberts
#7 lore raw

Re: [PATCH v2 5/5] libsepol: fix overflow and 0 length allocations

<snip>

Quoted 4 lines

Interesting, i'm not seeing these, ill roll these into v3 and see if I can reproduce to make sure they
don't come back.

OK, I have them reproduced and fixed for v3. I also have another patch locally for fixes with the fuzzer
running the longest run yet with no issues (14 hours).

Ill let these patches sit, and aggregate any other comments/concerns and send out v3 on Monday
August 15

<snip>