libsepol: calloc all the *_to_val_structs
PATCH v2 1/2 libsepol: calloc all the *_to_val_structs
From: William Roberts <[email protected]>
The usage patterns between these structures seem similair to role_val_to_struct usages. Calloc these up to prevent any unitialized usages.
--- libsepol/src/mls.c | 2 +- libsepol/src/policydb.c | 6 +++--- libsepol/src/users.c | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-)
libsepol/src/mls.c +1 -1
@@ -312,7 +312,7 @@ int mls_context_isvalid(const policydb_t * p, const context_struct_t * c)if (!c->user || c->user > p->p_users.nprim)return 0 ; usrdatum = p->user_val_to_struct[c->user -1 ]; -if (!mls_range_contains (usrdatum->exp_range, c->range)) +if (!usrdatum || !mls_range_contains (usrdatum->exp_range, c->range))return 0 ;/* user may not be associated with range */ return 1 ;
libsepol/src/policydb.c +3 -3
@@ -1074,7 +1074,7 @@ int policydb_index_others(sepol_handle_t * handle,free (p->user_val_to_struct); p->user_val_to_struct = (user_datum_t **) -malloc (p->p_users.nprim *sizeof (user_datum_t *)); +calloc (p->p_users.nprim,sizeof (user_datum_t *));if (!p->user_val_to_struct)return -1 ;
@@ -4006,12 +4006,12 @@ int policydb_reindex_users(policydb_t * p)free (p->sym_val_to_name[i]); p->user_val_to_struct = (user_datum_t **) -malloc (p->p_users.nprim *sizeof (user_datum_t *)); +calloc (p->p_users.nprim,sizeof (user_datum_t *));if (!p->user_val_to_struct)return -1 ; p->sym_val_to_name[i] = (char **) -malloc (p->symtab[i].nprim *sizeof (char *)); +calloc (p->symtab[i].nprim,sizeof (char *));if (!p->sym_val_to_name[i])return -1 ;
libsepol/src/users.c +8 -1
@@ -19,12 +19,17 @@ static int user_to_record(sepol_handle_t * handle,const char *name = policydb->p_user_val_to_name[user_idx];user_datum_t *usrdatum = policydb->user_val_to_struct[user_idx]; -ebitmap_t *roles = &(usrdatum->roles.roles); +ebitmap_t *roles;ebitmap_node_t *rnode;unsigned bit;sepol_user_t *tmp_record =NULL ; +if (!usrdatum) + goto err; + + roles = &(usrdatum->roles.roles); +if (sepol_user_create (handle, &tmp_record) <0 ) goto err;
@@ -234,6 +239,7 @@ int sepol_user_modify(sepol_handle_t * handle,if (!tmp_ptr) goto omem; policydb->user_val_to_struct = tmp_ptr; + policydb->user_val_to_struct[policydb->p_users.nprim] =NULL ; tmp_ptr = realloc(policydb->sym_val_to_name[SYM_USERS], (policydb->p_users.nprim +
@@ -241,6 +247,7 @@ int sepol_user_modify(sepol_handle_t * handle,if (!tmp_ptr) goto omem; policydb->sym_val_to_name[SYM_USERS ] = tmp_ptr; + policydb->p_user_val_to_name[policydb->p_users.nprim] =NULL ;/* Need to copy the user name */ name =strdup (cname);
Signature · 1 line
1.9.1
PATCH v2 2/2 libsepol: port str_read from kernel
From: William Roberts <[email protected]>
Rather than duplicating the following sequence:
1. Read len from file
2. alloc up space based on 1
3. read the contents into the buffer from 2
4. null terminate the buffer from 2
Use the str_read() function that is in the kernel, which collapses steps 2 and 4. This not only reduces redundant code, but also has the side-affect of providing a central check on zero_or_saturated lengths from step 1 when generating string values.
--- libsepol/src/conditional.c | 9 +-------- libsepol/src/module.c | 40 ++++++---------------------------------- libsepol/src/policydb.c | 10 +--------- libsepol/src/private.h | 1 + libsepol/src/services.c | 39 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 47 insertions(+), 52 deletions(-)
libsepol/src/conditional.c +1 -8
@@ -589,15 +589,8 @@ int cond_read_bool(policydb_t * p, goto err; len =le32_to_cpu (buf[2 ]); -if (zero_or_saturated (len)) +if (str_read (&key, fp, len)) goto err; - key =malloc (len +1 ); -if (!key) - goto err; - rc =next_entry (key, fp, len); -if (rc <0 ) - goto err; - key[len] =0 ;if (p->policy_type !=POLICY_KERN && p->policyvers >=MOD_POLICYDB_VERSION_TUNABLE_SEP ) {
libsepol/src/module.c +6 -34
@@ -793,26 +793,13 @@ int sepol_module_package_info(struct sepol_policy_file *spf, int *type, i); 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" ); - goto cleanup; - } - rc =next_entry (*name, file, len); -if (rc <0 ) { -ERR (file->handle, -"cannot get module name string (at section %u)" , - i); +if (str_read (name, file, len)) { +ERR (file->handle,"%s" ,strerror (errno)); goto cleanup; } - (*name)[len] ='\0' ; + rc =next_entry (buf, file,sizeof (uint32_t ));if (rc <0 ) { ERR(file->handle,
@@ -821,25 +808,10 @@ 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" ); - goto cleanup; - } - rc =next_entry (*version, file, len); -if (rc <0 ) { -ERR (file->handle, -"cannot get module version string (at section %u)" , - i); +if (str_read (version, file, len)) { +ERR (file->handle,"%s" ,strerror (errno)); goto cleanup; } - (*version)[len] ='\0' ; seen |=SEEN_MOD ;break ;default :
libsepol/src/policydb.c +1 -9
@@ -1911,19 +1911,11 @@ static int perm_read(policydb_t * p goto bad; len =le32_to_cpu (buf[0 ]); -if (zero_or_saturated (len)) +if (str_read (&key, fp, len)) goto bad; perdatum->s.value =le32_to_cpu (buf[1 ]); - key =malloc (len +1 ); -if (!key) - goto bad; - rc =next_entry (key, fp, len); -if (rc <0 ) - goto bad; - key[len] =0 ; -if (hashtab_insert (h, key, perdatum)) goto bad;
libsepol/src/private.h +1 -0
@@ -65,3 +65,4 @@ extern struct policydb_compat_info *policydb_lookup_compat(unsigned int version, extern int next_entry(void *buf, struct policy_file *fp, size_t bytes) hidden; extern size_t put_entry(const void *ptr, size_t size, size_t n, struct policy_file *fp) hidden; +extern int str_read(char **strp, struct policy_file *fp, size_t len) hidden;
libsepol/src/services.c +38 -1
@@ -1639,13 +1639,16 @@ int hidden next_entry(void *buf, struct policy_file *fp, size_t bytes)return -1 ;break ;case PF_USE_MEMORY : -if (bytes > fp->len) +if (bytes > fp->len) { + errno =EOVERFLOW ;return -1 ; + }memcpy (buf, fp->data, bytes); fp->data += bytes; fp->len -= bytes;break ;default : + errno =EINVAL ;return -1 ; }return 0 ;
@@ -1679,6 +1682,40 @@ size_t hidden put_entry(const void *ptr, size_t size, size_t n, }/* +* Reads a string and null terminates it from the policy file. +* This is a port of str_read from the SE Linux kernel code. +* +* It returns: +* 0 - Success +* -1 - Failure with errno set +*/ +int hidden str_read(char **strp, struct policy_file *fp, size_t len) +{ +int rc; +char *str; + +if (zero_or_saturated (len)) { + errno =EINVAL ; +return -1 ; + } + + str =malloc (len +1 ); +if (!str) +return -1 ; + +/* it's expected the caller should free the str */ + *strp = str; + +/* next_entry sets errno */ + rc =next_entry (str, fp, len); +if (rc) +return rc; + + str[len] ='\0' ; +return 0 ; +} + +/* * Read a new set of configuration data from * a policy database binary representation file. *
Signature · 1 line
1.9.1
Quoted 7 lines · On 08/19/2016 11:51 AM, [email protected] wrote:
From: William Roberts <[email protected]>
The usage patterns between these structures seem similair to
role_val_to_structusages. Calloc these up to prevent any unitialized usages.Signed-off-by William Roberts <[email protected]>
Applied both patches.
Thanks,
Jim
Quoted 87 lines
--- libsepol/src/mls.c | 2 +- libsepol/src/policydb.c | 6 +++--- libsepol/src/users.c | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-)libsepol/src/mls.c +1
-1@@ -312,7 +312,7 @@ int mls_context_isvalid(const policydb_t * p, const context_struct_t * c)if (!c->user || c->user > p->p_users.nprim)return 0 ; usrdatum = p->user_val_to_struct[c->user -1 ]; -if (!mls_range_contains (usrdatum->exp_range, c->range)) +if (!usrdatum || !mls_range_contains (usrdatum->exp_range, c->range))return 0 ;/* user may not be associated with range */ return 1 ;libsepol/src/policydb.c +3
-3@@ -1074,7 +1074,7 @@ int policydb_index_others(sepol_handle_t * handle,free (p->user_val_to_struct); p->user_val_to_struct = (user_datum_t **) -malloc (p->p_users.nprim *sizeof (user_datum_t *)); +calloc (p->p_users.nprim,sizeof (user_datum_t *));if (!p->user_val_to_struct)return -1 ;@@ -4006,12 +4006,12 @@ int policydb_reindex_users(policydb_t * p)free (p->sym_val_to_name[i]); p->user_val_to_struct = (user_datum_t **) -malloc (p->p_users.nprim *sizeof (user_datum_t *)); +calloc (p->p_users.nprim,sizeof (user_datum_t *));if (!p->user_val_to_struct)return -1 ; p->sym_val_to_name[i] = (char **) -malloc (p->symtab[i].nprim *sizeof (char *)); +calloc (p->symtab[i].nprim,sizeof (char *));if (!p->sym_val_to_name[i])return -1 ;libsepol/src/users.c +8
-1@@ -19,12 +19,17 @@ static int user_to_record(sepol_handle_t * handle,const char *name = policydb->p_user_val_to_name[user_idx];user_datum_t *usrdatum = policydb->user_val_to_struct[user_idx]; -ebitmap_t *roles = &(usrdatum->roles.roles); +ebitmap_t *roles;ebitmap_node_t *rnode;unsigned bit;sepol_user_t *tmp_record =NULL ; +if (!usrdatum) + goto err; + + roles = &(usrdatum->roles.roles); +if (sepol_user_create (handle, &tmp_record) <0 ) goto err;@@ -234,6 +239,7 @@ int sepol_user_modify(sepol_handle_t * handle,if (!tmp_ptr) goto omem; policydb->user_val_to_struct = tmp_ptr; + policydb->user_val_to_struct[policydb->p_users.nprim] =NULL ; tmp_ptr = realloc(policydb->sym_val_to_name[SYM_USERS], (policydb->p_users.nprim +@@ -241,6 +247,7 @@ int sepol_user_modify(sepol_handle_t * handle,if (!tmp_ptr) goto omem; policydb->sym_val_to_name[SYM_USERS ] = tmp_ptr; + policydb->p_user_val_to_name[policydb->p_users.nprim] =NULL ;/* Need to copy the user name */ name =strdup (cname);
Signature · 2 lines
James Carter <[email protected]> National Security Agency