Fix AFL Found Bugs in libsepol v4
So the delta between v3 and v4 is addressing the comments on "fix overflow and 0 length allocations", and also move that patch to the end of the series. Take up to where you have issues as each patch can stand on its own.
[PATCH v4 1/7] libsepol: fix invalid access of NULL on
[PATCH v4 2/7] libsepol: ensure key is valid before doing search
[PATCH v4 3/7] ebitmap: detect invalid bitmap
[PATCH v4 4/7] genfs_read: fix use heap-use-after-free
[PATCH v4 5/7] libsepol: bound attr_type_map access by nprim
[PATCH v4 6/7] libsepol: fix unitialized jmp and invalid dereference
[PATCH v4 7/7] libsepol: fix overflow and 0 length allocations
PATCH v4 1/7 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
@@ -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
PATCH v4 2/7 libsepol: ensure key is valid before doing search
In reply to [email protected]From: William Roberts <[email protected]>
--- libsepol/src/mls.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
libsepol/src/mls.c +7 -5
@@ -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
PATCH v4 3/7 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
@@ -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
PATCH v4 4/7 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
@@ -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
PATCH v4 5/7 libsepol: bound attr_type_map access by nprim
In reply to [email protected]From: William Roberts <[email protected]>
Correct an invalid memory access when attr_type_map array indexing is outside of bounds.
--- libsepol/src/policydb.c | 4 ++++ 1 file changed, 4 insertions(+)
libsepol/src/policydb.c +4 -0
@@ -3926,6 +3926,10 @@ int policydb_read(policydb_t * p, struct policy_file *fp, unsigned verbose)if (!ebitmap_node_get_bit (tnode, j) || i == j)continue ; + +if (j >= p->p_types.nprim) + goto bad; +if (ebitmap_set_bit (&p->attr_type_map[j], i,1 )) goto bad;
Signature · 1 line
1.9.1
PATCH v4 6/7 libsepol: fix unitialized jmp and invalid dereference
In reply to [email protected]From: William Roberts <[email protected]>
When initializing role_datum_t array, initialize the array. This corrects this issue:
==25766== Conditional jump or move depends on uninitialised value(s)
==25766== at 0x40ABFE: context_is_valid (context.c:59) ==25766== by 0x40AAED: policydb_context_isvalid (context.c:19) ==25766== by 0x43CBF4: context_read_and_validate (policydb.c:1881) ==25766== by 0x43E7B3: ocontext_read_selinux (policydb.c:2631) ==25766== by 0x43EC4D: ocontext_read (policydb.c:2729) ==25766== by 0x442019: policydb_read (policydb.c:3937) ==25766== by 0x442F15: sepol_policydb_read (policydb_public.c:174) ==25766== by 0x407ED4: init (check_seapp.c:885) ==25766== by 0x408D83: main (check_seapp.c:1230)
Also, check for NULL when determining if a role can be associated with a type.
--- libsepol/src/context.c | 2 +- libsepol/src/policydb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
libsepol/src/context.c +1 -1
@@ -55,7 +55,7 @@ int context_is_valid(const policydb_t * p, const context_struct_t * c)* Role must be authorized for the type. */ role = p->role_val_to_struct[c->role -1 ]; -if (!ebitmap_get_bit (&role->cache, c->type -1 )) +if (!role || !ebitmap_get_bit (&role->cache, c->type -1 ))/* role may not be associated with type */ return 0 ;
libsepol/src/policydb.c +1 -1
@@ -1068,7 +1068,7 @@ int policydb_index_others(sepol_handle_t * handle,free (p->role_val_to_struct); p->role_val_to_struct = (role_datum_t **) -malloc (p->p_roles.nprim *sizeof (role_datum_t *)); +calloc (p->p_roles.nprim,sizeof (role_datum_t *));if (!p->role_val_to_struct)return -1 ;
Signature · 1 line
1.9.1
PATCH v4 7/7 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 | 72 +++++++++++++++++++++++++++++-------------- libsepol/src/module.c | 13 ++++++++ libsepol/src/module_to_cil.c | 4 ++- libsepol/src/policydb.c | 52 +++++++++++++++++++++++++++++-- libsepol/src/private.h | 3 ++ 7 files changed, 130 insertions(+), 33 deletions(-)
libsepol/src/conditional.c +2 -1
@@ -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
@@ -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 +49 -23
99 lines not on this page · raw message
libsepol/src/module.c +13 -0
@@ -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
@@ -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 +49 -3
173 lines not on this page · raw message
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;
Signature · 1 line
1.9.1
RE: [PATCH v4 7/7] libsepol: fix overflow and 0 length allocations
Quoted 105 lines
-----Original Message-----
From: Roberts, William C
Sent: Tuesday, August 16, 2016 10:29 AM
To: [email protected]; [email protected]; seandroid- [email protected]; [email protected]
Cc: Roberts, William C <[email protected]>
Subject: [PATCH v4 7/7] libsepol: fix overflow and 0 length allocationsFrom: 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.
Signed-off-by William Roberts <[email protected]>--- libsepol/src/conditional.c | 3 +- libsepol/src/context.c | 16 +++++++--- libsepol/src/context_record.c | 72 +++++++++++++++++++++++++++++---------- ---- libsepol/src/module.c | 13 ++++++++ libsepol/src/module_to_cil.c | 4 ++- libsepol/src/policydb.c | 52 +++++++++++++++++++++++++++++-- libsepol/src/private.h | 3 ++ 7 files changed, 130 insertions(+), 33 deletions(-)libsepol/src/conditional.c index renamed from libsepol/src/conditional.c +0
-0ea47cdd..8680eb2 100644
libsepol/src/conditional.c +2
-1@@ -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 index 420ee16..a88937f renamed from libsepol/src/context.c +0
-0100644
libsepol/src/context.c +11
-5@@ -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 index renamed from libsepol/src/context_record.c +0
-0ac2884a..0a8bbf6 100644
libsepol/src/context_record.c +3
-0@@ -5,6 +5,7 @@#include "context_internal.h" #include "debug.h" +#include "private.h" struct sepol_context {@@ -279,44 +280,69 @@ int sepol_context_from_string(sepol_handle_t * handle, hidden_def(sepol_context_from_string) +static inline int safe_sum (size_t *sum,const size_t augends[],const +size_t cnt) {
libsepol/src/context_record.c int sepol_context_from_string(sepol_handle_t * · line 295
Quoted 10 lines
libsepol/src/context_record.c +10
-0+ +size_t a, i; + + *sum =0 ; +for (i=0 ; i < cnt; i++) { +/* sum should not be smaller than the addend */ + a = augends[i]; + *sum += a; +if (*sum < a) { +return i;
Damn it...this does not work when index 0 is the bad one... I'll wait till Tomorrow and aggregate responses again.
Quoted 368 lines
libsepol/src/context_record.c +14
-10+ } + } + +return 0 ; +} +int sepol_context_to_string (sepol_handle_t * handle,const sepol_context_t * con,char **str_ptr) {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 + - mls_sz + ((con->mls) ?3 :2 ); - -char *str = (char *)malloc (total_sz +1 ); -if (!str) - goto omem; +char *str =NULL ; +size_t total_sz, err; +const size_t sizes[] = { +strlen (con->user),/* user length */ +strlen (con->role),/* role length */ +strlen (con->type),/* type length */ + (con->mls) ?strlen (con->mls) :0 ,/* mls length */ + ((con->mls) ?3 :2 ) +1 /* mls has extra ":" also null byte */
libsepol/src/context_record.c +23
-13+ }; + + err =safe_sum (&total_sz, sizes,ARRAY_SIZE (sizes)); +if (err) { +ERR (handle,"invalid size, overflow at position: %zu" , err); + goto err; + } + str = (char *)malloc (total_sz); +if (!str) { +ERR (handle,"out of memory" ); + goto err; + }if (con->mls) { - rc =snprintf (str, total_sz +1 ,"%s:%s:%s:%s" , + rc =snprintf (str, total_sz,"%s:%s:%s:%s" , con->user, con->role, con->type, con->mls); -if (rc <0 || (rc >= total_sz +1 )) { -ERR (handle,"print error" ); - goto err; - } }else { - rc =snprintf (str, total_sz +1 ,"%s:%s:%s" , + rc =snprintf (str, total_sz,"%s:%s:%s" , con->user, con->role, con->type); -if (rc <0 || (rc >= total_sz +1 )) { -ERR (handle,"print error" ); - goto err; - } + } + +/* +* rc is >= 0 on the size_t cast and is safe to promote +* to an unsigned value. +*/ +if (rc <0 || (size_t )rc >= total_sz) { +ERR (handle,"print error" ); + goto err; } *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 index 1665ede..f25df95 renamed from libsepol/src/module.c +0
-0100644
libsepol/src/module.c +1
-0@@ -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_SEUSER0x97cff91@@ -793,6 +794,12 @@ int sepol_module_package_info(structsepol_policy_file*spf, int *type,libsepol/src/module.c +7
-0goto 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,
libsepol/src/module.c +6
-0goto 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"); diff --git
a/libsepol/src/module_to_cil.cb/libsepol/src/module_to_cil.cindex 36f3b7d..fc65019 100644libsepol/src/module_to_cil.c +2
-0@@ -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)libsepol/src/module_to_cil.c +1
-1for (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 index renamed from libsepol/src/policydb.c +0
-060761b7..c225ac6 100644
libsepol/src/policydb.c +6
-0@@ -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 intclass_read(policydb_t * p, hashtab_t h, struct policy_file *fp)libsepol/src/policydb.c +4
-0goto 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)libsepol/src/policydb.c +6
-0goto 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)) {libsepol/src/policydb.c +2
-0uint32_t properties;@@ -2447,6 +2463,8 @@ int filename_trans_read(filename_trans_t **t, struct policy_file *fp)if (rc <0 )return -1 ; len =le32_to_cpu (buf[0 ]); +if (zero_or_saturated (len)) +return -1 ; name =calloc (len +1 ,sizeof (*name));libsepol/src/policydb.c +3
-0if (!name)@@ -2556,6 +2574,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)libsepol/src/policydb.c +2
-0return -1 ;@@ -2618,6 +2639,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)libsepol/src/policydb.c +2
-0return -1 ;@@ -2659,6 +2682,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)libsepol/src/policydb.c +3
-1return -1 ;@@ -2719,7 +2744,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 +2758,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)libsepol/src/policydb.c +2
-0goto bad;@@ -2778,6 +2805,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) {libsepol/src/policydb.c +3
-0goto bad;@@ -2877,6 +2906,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 +2992,9
@@ static int sens_read(policydb_t * plibsepol/src/policydb.c +6
-0goto 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 +3038,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 +3377,8 @@ static intfilename_trans_rule_read(filename_trans_rule_t ** r, struct
policy_filibsepol/src/policydb.c +4
-0return -1 ; len =le32_to_cpu (buf[0 ]); +if (zero_or_saturated (len)) +return -1 ; ftr->name =malloc (len +1 );if (!ftr->name)@@ -3580,6 +3620,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)libsepol/src/policydb.c +5
-2goto cleanup;@@ -3664,8 +3706,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 +3840,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 +3853,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/policydb.c +0
-0}libsepol/src/private.h index 9c700c9..0beb4d4 renamed from libsepol/src/private.h +0
-0100644
libsepol/src/private.h +3
-1@@ -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; --1.9.1
Re: [PATCH v4 7/7] libsepol: fix overflow and 0 length allocations
Quoted 103 lines · William C
Quoted 103 lines
-----Original Message-----
From: Roberts, William C
Sent: Tuesday, August 16, 2016 10:29 AM
To: [email protected]; [email protected]; seandroid- [email protected]; [email protected]
Cc: Roberts, William C <[email protected]>
Subject: [PATCH v4 7/7] libsepol: fix overflow and 0 length allocationsFrom: 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.
Signed-off-by William Roberts <[email protected]>--- libsepol/src/conditional.c | 3 +- libsepol/src/context.c | 16 +++++++--- libsepol/src/context_record.c | 72 +++++++++++++++++++++++++++++---------- ---- libsepol/src/module.c | 13 ++++++++ libsepol/src/module_to_cil.c | 4 ++- libsepol/src/policydb.c | 52 +++++++++++++++++++++++++++++-- libsepol/src/private.h | 3 ++ 7 files changed, 130 insertions(+), 33 deletions(-)libsepol/src/conditional.c index renamed from libsepol/src/conditional.c +0
-0ea47cdd..8680eb2 100644
libsepol/src/conditional.c +2
-1@@ -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 index 420ee16..a88937f renamed from libsepol/src/context.c +0
-0100644
libsepol/src/context.c +11
-5@@ -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 index renamed from libsepol/src/context_record.c +0
-0ac2884a..0a8bbf6 100644
libsepol/src/context_record.c +1
-0@@ -5,6 +5,7 @@#include "context_internal.h" #include "debug.h" +#include "private.h" struct sepol_context {@@ -279,44 +280,69 @@ int sepol_context_from_string(sepol_handle_t * handle,hidden_def (sepol_context_from_string)
Quoted 15 lines
libsepol/src/context_record.c int sepol_context_from_string(sepol_handle_t * handle, · line 293
Quoted 12 lines
libsepol/src/context_record.c +12
-0+static inline int safe_sum (size_t *sum,const size_t augends[],const +size_t cnt) { + +size_t a, i; + + *sum =0 ; +for (i=0 ; i < cnt; i++) { +/* sum should not be smaller than the addend */ + a = augends[i]; + *sum += a; +if (*sum < a) { +return i;Damn it...this does not work when index 0 is the bad one... I'll wait till Tomorrow and aggregate responses again.
Use __builtin_add_overflow()?
Quoted 11 lines · On 08/16/2016 01:28 PM, [email protected] wrote:
So the delta between v3 and v4 is addressing the comments on "fix overflow and 0 length allocations", and also move that patch to the end of the series. Take up to where you have issues as each patch can stand on its own.
[PATCH v4 1/7] libsepol: fix invalid access of NULL on
[PATCH v4 2/7] libsepol: ensure key is valid before doing search
[PATCH v4 3/7] ebitmap: detect invalid bitmap
Quoted 8 lines
[PATCH v4 4/7]
genfs_read: fix use heap-use-after-free[PATCH v4 5/7] libsepol: bound
attr_type_mapaccess by nprim[PATCH v4 6/7] libsepol: fix unitialized jmp and invalid dereference
[PATCH v4 7/7] libsepol: fix overflow and 0 length allocations
Applied all patches.
Thanks,
Jim
Signature · 2 lines
James Carter <[email protected]> National Security Agency