libsepol: mark immutable mls and context parameter const
PATCH 1/2 libsepol: mark immutable mls and context parameter const
Make it more obvious which parameters are read-only and not being modified and allow callers to pass const pointers.
Signed-off-by Christian Göttsche <[email protected]>
--- libsepol/include/sepol/policydb/context.h | 14 +++++++------- libsepol/include/sepol/policydb/mls_types.h | 12 ++++++------ libsepol/src/mls.c | 17 +++++++++-------- libsepol/src/mls.h | 4 ++-- 4 files changed, 24 insertions(+), 23 deletions(-)
libsepol/include/sepol/policydb/context.h +7 -7
@@ -43,7 +43,7 @@ static inline void mls_context_init(context_struct_t * c) }static inline int mls_context_cpy (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {if (mls_range_cpy (&dst->range, &src->range) <0 )
@@ -55,7 +55,7 @@ static inline int mls_context_cpy(context_struct_t * dst,/* * Sets both levels in the MLS range of 'dst' to the low level of 'src'. */ -static inline int mls_context_cpy_low (context_struct_t *dst,context_struct_t *src) +static inline int mls_context_cpy_low (context_struct_t *dst,const context_struct_t *src) {int rc;
@@ -75,7 +75,7 @@ out:/* * Sets both levels in the MLS range of 'dst' to the high level of 'src'. */ -static inline int mls_context_cpy_high (context_struct_t *dst,context_struct_t *src) +static inline int mls_context_cpy_high (context_struct_t *dst,const context_struct_t *src) {int rc;
@@ -92,12 +92,12 @@ out:return rc; } -static inline int mls_context_glblub (context_struct_t *dst,context_struct_t *c1,context_struct_t *c2) +static inline int mls_context_glblub (context_struct_t *dst,const context_struct_t *c1,const context_struct_t *c2) {return mls_range_glblub (&dst->range, &c1->range, &c2->range); } -static inline int mls_context_cmp (context_struct_t * c1,context_struct_t * c2) +static inline int mls_context_cmp (const context_struct_t * c1,const context_struct_t * c2) {return (mls_level_eq (&c1->range.level[0 ], &c2->range.level[0 ]) &&mls_level_eq (&c1->range.level[1 ], &c2->range.level[1 ]));
@@ -118,7 +118,7 @@ static inline void context_init(context_struct_t * c)memset (c,0 ,sizeof (*c)); } -static inline int context_cpy (context_struct_t * dst,context_struct_t * src) +static inline int context_cpy (context_struct_t * dst,const context_struct_t * src) { dst->user = src->user; dst->role = src->role;
@@ -135,7 +135,7 @@ static inline void context_destroy(context_struct_t * c)mls_context_destroy (c); } -static inline int context_cmp (context_struct_t * c1,context_struct_t * c2) +static inline int context_cmp (const context_struct_t * c1,const context_struct_t * c2) { return ((c1->user == c2->user) && (c1->role == c2->role) &&
libsepol/include/sepol/policydb/mls_types.h +6 -6
@@ -50,7 +50,7 @@ typedef struct mls_range {mls_level_t level[2 ];/* low == level[0], high == level[1] */ } mls_range_t; -static inline int mls_range_glblub (struct mls_range *dst,struct mls_range *r1,struct mls_range *r2) +static inline int mls_range_glblub (struct mls_range *dst,const struct mls_range *r1,const struct mls_range *r2) {if (r1->level[1 ].sens < r2->level[0 ].sens || r2->level[1 ].sens < r1->level[0 ].sens) {/* These ranges have no common sensitivities */
@@ -74,7 +74,7 @@ static inline int mls_range_glblub(struct mls_range *dst, struct mls_range *r1, } -static inline int mls_level_cpy (struct mls_level *dst,struct mls_level *src) +static inline int mls_level_cpy (struct mls_level *dst,const struct mls_level *src) { dst->sens = src->sens;
@@ -119,7 +119,7 @@ static inline int mls_level_dom(const struct mls_level *l1, const struct mls_lev (mls_level_dom (&(r2).level[0 ], &(r1).level[0 ]) && \ mls_level_dom(&(r1).level[1], &(r2).level[1])) -static inline int mls_range_cpy (mls_range_t * dst,mls_range_t * src) +static inline int mls_range_cpy (mls_range_t * dst,const mls_range_t * src) {if (mls_level_cpy (&dst->level[0 ], &src->level[0 ]) <0 )
@@ -149,7 +149,7 @@ static inline void mls_range_destroy(struct mls_range *r)mls_level_destroy (&r->level[1 ]); } -static inline int mls_range_eq (struct mls_range *r1,struct mls_range *r2) +static inline int mls_range_eq (const struct mls_range *r1,const struct mls_range *r2) {return (mls_level_eq (&r1->level[0 ], &r2->level[0 ]) &&mls_level_eq (&r1->level[1 ], &r2->level[1 ]));
@@ -174,10 +174,10 @@ extern void mls_semantic_cat_init(mls_semantic_cat_t *c);extern void mls_semantic_cat_destroy (mls_semantic_cat_t *c);extern void mls_semantic_level_init (mls_semantic_level_t *l);extern void mls_semantic_level_destroy (mls_semantic_level_t *l); -extern int mls_semantic_level_cpy (mls_semantic_level_t *dst,mls_semantic_level_t *src); +extern int mls_semantic_level_cpy (mls_semantic_level_t *dst,const mls_semantic_level_t *src);extern void mls_semantic_range_init (mls_semantic_range_t *r);extern void mls_semantic_range_destroy (mls_semantic_range_t *r); -extern int mls_semantic_range_cpy (mls_semantic_range_t *dst,mls_semantic_range_t *src); +extern int mls_semantic_range_cpy (mls_semantic_range_t *dst,const mls_semantic_range_t *src); #ifdef __cplusplus }
libsepol/src/mls.c +9 -8
@@ -451,7 +451,7 @@ int mls_context_to_sid(const policydb_t * policydb,* Copies the MLS range from `src' into `dst'. */ static inline int mls_copy_context (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {int l, rc =0 ;
@@ -471,7 +471,7 @@ static inline int mls_copy_context(context_struct_t * dst,* Copies the effective MLS range from `src' into `dst'. */ static inline int mls_scopy_context (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {int l, rc =0 ;
@@ -490,7 +490,7 @@ static inline int mls_scopy_context(context_struct_t * dst,/* * Copies the MLS range `range' into `context'. */ -static inline int mls_range_set (context_struct_t * context,mls_range_t * range) +static inline int mls_range_set (context_struct_t * context,const mls_range_t * range) {int l, rc =0 ;
@@ -601,8 +601,8 @@ int mls_convert_context(policydb_t * oldp, }int mls_compute_sid (policydb_t * policydb, -context_struct_t * scontext, -context_struct_t * tcontext, +const context_struct_t * scontext, +const context_struct_t * tcontext,sepol_security_class_t tclass,uint32_t specified,context_struct_t * newcontext) {
@@ -755,9 +755,10 @@ void mls_semantic_level_destroy(mls_semantic_level_t * l) }int mls_semantic_level_cpy (mls_semantic_level_t * dst, -mls_semantic_level_t * src) +const mls_semantic_level_t * src) { -mls_semantic_cat_t *cat, *newcat, *lnewcat =NULL ; +const mls_semantic_cat_t *cat; +mls_semantic_cat_t *newcat, *lnewcat =NULL ;mls_semantic_level_init (dst); dst->sens = src->sens;
@@ -800,7 +801,7 @@ void mls_semantic_range_destroy(mls_semantic_range_t * r) }int mls_semantic_range_cpy (mls_semantic_range_t * dst, -mls_semantic_range_t * src) +const mls_semantic_range_t * src) {if (mls_semantic_level_cpy (&dst->level[0 ], &src->level[0 ]) <0 )return -1 ;
libsepol/src/mls.h +2 -2
@@ -56,8 +56,8 @@ extern int mls_convert_context(policydb_t * oldp, policydb_t * newp, context_struct_t * context);extern int mls_compute_sid (policydb_t * policydb, -context_struct_t * scontext, -context_struct_t * tcontext, +const context_struct_t * scontext, +const context_struct_t * tcontext,sepol_security_class_t tclass,uint32_t specified,context_struct_t * newcontext);
Signature · 1 line
2.35.1
PATCH 2/2 libsepol: mark immutable common helper parameter const
Make it more obvious which parameters are read-only and not being modified and allow callers to pass const pointers.
Signed-off-by Christian Göttsche <[email protected]>
--- libsepol/src/kernel_to_common.c | 16 ++++++++-------- libsepol/src/kernel_to_common.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
libsepol/src/kernel_to_common.c +8 -8
@@ -267,12 +267,12 @@ void strs_sort(struct strs *strs)qsort (strs->list, strs->num,sizeof (char *), strs_cmp); } -unsigned strs_num_items (struct strs *strs) +unsigned strs_num_items (const struct strs *strs) {return strs->num; } -size_t strs_len_items (struct strs *strs) +size_t strs_len_items (const struct strs *strs) {unsigned i;size_t len =0 ;
@@ -285,7 +285,7 @@ size_t strs_len_items(struct strs *strs)return len; } -char *strs_to_str (struct strs *strs) +char *strs_to_str (const struct strs *strs) {char *str =NULL ;size_t len =0 ;
@@ -327,7 +327,7 @@ exit:return str; } -void strs_write_each (struct strs *strs,FILE *out) +void strs_write_each (const struct strs *strs,FILE *out) {unsigned i;
@@ -339,7 +339,7 @@ void strs_write_each(struct strs *strs, FILE *out) } } -void strs_write_each_indented (struct strs *strs,FILE *out,int indent) +void strs_write_each_indented (const struct strs *strs,FILE *out,int indent) {unsigned i;
@@ -360,7 +360,7 @@ int hashtab_ordered_to_strs(char *key, void *data, void *args)return strs_add_at_index (strs, key, datum->value-1 ); } -int ebitmap_to_strs (struct ebitmap *map,struct strs *strs,char **val_to_name) +int ebitmap_to_strs (const struct ebitmap *map,struct strs *strs,char **val_to_name) {struct ebitmap_node *node;uint32_t i;
@@ -379,7 +379,7 @@ int ebitmap_to_strs(struct ebitmap *map, struct strs *strs, char **val_to_name)return 0 ; } -char *ebitmap_to_str (struct ebitmap *map,char **val_to_name,int sort) +char *ebitmap_to_str (const struct ebitmap *map,char **val_to_name,int sort) {struct strs *strs;char *str =NULL ;
@@ -427,7 +427,7 @@ char *strs_stack_pop(struct strs *stack)return strs_remove_last (stack); } -int strs_stack_empty (struct strs *stack) +int strs_stack_empty (const struct strs *stack) {return strs_num_items (stack) ==0 ; }
libsepol/src/kernel_to_common.h +8 -8
@@ -102,19 +102,19 @@ char *strs_remove_last(struct strs *strs);int strs_add_at_index (struct strs *strs,char *s,size_t index);char *strs_read_at_index (struct strs *strs,size_t index);void strs_sort (struct strs *strs); -unsigned strs_num_items (struct strs *strs); -size_t strs_len_items (struct strs *strs); -char *strs_to_str (struct strs *strs); -void strs_write_each (struct strs *strs,FILE *out); -void strs_write_each_indented (struct strs *strs,FILE *out,int indent); +unsigned strs_num_items (const struct strs *strs); +size_t strs_len_items (const struct strs *strs); +char *strs_to_str (const struct strs *strs); +void strs_write_each (const struct strs *strs,FILE *out); +void strs_write_each_indented (const struct strs *strs,FILE *out,int indent);int hashtab_ordered_to_strs (char *key,void *data,void *args); -int ebitmap_to_strs (struct ebitmap *map,struct strs *strs,char **val_to_name); -char *ebitmap_to_str (struct ebitmap *map,char **val_to_name,int sort); +int ebitmap_to_strs (const struct ebitmap *map,struct strs *strs,char **val_to_name); +char *ebitmap_to_str (const struct ebitmap *map,char **val_to_name,int sort);int strs_stack_init (struct strs **stack);void strs_stack_destroy (struct strs **stack);int strs_stack_push (struct strs *stack,char *s);char *strs_stack_pop (struct strs *stack); -int strs_stack_empty (struct strs *stack); +int strs_stack_empty (const struct strs *stack);int sort_ocontexts (struct policydb *pdb);
Signature · 1 line
2.35.1
Quoted 5 lines · Christian Göttsche
Make it more obvious which parameters are read-only and not being modified and allow callers to pass const pointers.
Signed-off-by Christian Göttsche <[email protected]>
For these two patches:
Acked-by James Carter <[email protected]>
Quoted 206 lines
--- libsepol/include/sepol/policydb/context.h | 14 +++++++------- libsepol/include/sepol/policydb/mls_types.h | 12 ++++++------ libsepol/src/mls.c | 17 +++++++++-------- libsepol/src/mls.h | 4 ++-- 4 files changed, 24 insertions(+), 23 deletions(-)libsepol/include/sepol/policydb/context.h +7
-7@@ -43,7 +43,7 @@ static inline void mls_context_init(context_struct_t * c) }static inline int mls_context_cpy (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {if (mls_range_cpy (&dst->range, &src->range) <0 )@@ -55,7 +55,7 @@ static inline int mls_context_cpy(context_struct_t * dst,/* * Sets both levels in the MLS range of 'dst' to the low level of 'src'. */ -static inline int mls_context_cpy_low (context_struct_t *dst,context_struct_t *src) +static inline int mls_context_cpy_low (context_struct_t *dst,const context_struct_t *src) {int rc;@@ -75,7 +75,7 @@ out:/* * Sets both levels in the MLS range of 'dst' to the high level of 'src'. */ -static inline int mls_context_cpy_high (context_struct_t *dst,context_struct_t *src) +static inline int mls_context_cpy_high (context_struct_t *dst,const context_struct_t *src) {int rc;@@ -92,12 +92,12 @@ out:return rc; } -static inline int mls_context_glblub (context_struct_t *dst,context_struct_t *c1,context_struct_t *c2) +static inline int mls_context_glblub (context_struct_t *dst,const context_struct_t *c1,const context_struct_t *c2) {return mls_range_glblub (&dst->range, &c1->range, &c2->range); } -static inline int mls_context_cmp (context_struct_t * c1,context_struct_t * c2) +static inline int mls_context_cmp (const context_struct_t * c1,const context_struct_t * c2) {return (mls_level_eq (&c1->range.level[0 ], &c2->range.level[0 ]) &&mls_level_eq (&c1->range.level[1 ], &c2->range.level[1 ]));@@ -118,7 +118,7 @@ static inline void context_init(context_struct_t * c)memset (c,0 ,sizeof (*c)); } -static inline int context_cpy (context_struct_t * dst,context_struct_t * src) +static inline int context_cpy (context_struct_t * dst,const context_struct_t * src) { dst->user = src->user; dst->role = src->role;@@ -135,7 +135,7 @@ static inline void context_destroy(context_struct_t * c)mls_context_destroy (c); } -static inline int context_cmp (context_struct_t * c1,context_struct_t * c2) +static inline int context_cmp (const context_struct_t * c1,const context_struct_t * c2) { return ((c1->user == c2->user) && (c1->role == c2->role) &&libsepol/include/sepol/policydb/mls_types.h +6
-6@@ -50,7 +50,7 @@ typedef struct mls_range {mls_level_t level[2 ];/* low == level[0], high == level[1] */ } mls_range_t; -static inline int mls_range_glblub (struct mls_range *dst,struct mls_range *r1,struct mls_range *r2) +static inline int mls_range_glblub (struct mls_range *dst,const struct mls_range *r1,const struct mls_range *r2) {if (r1->level[1 ].sens < r2->level[0 ].sens || r2->level[1 ].sens < r1->level[0 ].sens) {/* These ranges have no common sensitivities */ @@ -74,7 +74,7 @@ static inline int mls_range_glblub(struct mls_range *dst, struct mls_range *r1, } -static inline int mls_level_cpy (struct mls_level *dst,struct mls_level *src) +static inline int mls_level_cpy (struct mls_level *dst,const struct mls_level *src) { dst->sens = src->sens;@@ -119,7 +119,7 @@ static inline int mls_level_dom(const struct mls_level *l1, const struct mls_lev (mls_level_dom (&(r2).level[0 ], &(r1).level[0 ]) && \ mls_level_dom(&(r1).level[1], &(r2).level[1])) -static inline int mls_range_cpy (mls_range_t * dst,mls_range_t * src) +static inline int mls_range_cpy (mls_range_t * dst,const mls_range_t * src) {if (mls_level_cpy (&dst->level[0 ], &src->level[0 ]) <0 )@@ -149,7 +149,7 @@ static inline void mls_range_destroy(struct mls_range *r)mls_level_destroy (&r->level[1 ]); } -static inline int mls_range_eq (struct mls_range *r1,struct mls_range *r2) +static inline int mls_range_eq (const struct mls_range *r1,const struct mls_range *r2) {return (mls_level_eq (&r1->level[0 ], &r2->level[0 ]) &&mls_level_eq (&r1->level[1 ], &r2->level[1 ]));@@ -174,10 +174,10 @@ extern void mls_semantic_cat_init(mls_semantic_cat_t *c);extern void mls_semantic_cat_destroy (mls_semantic_cat_t *c);extern void mls_semantic_level_init (mls_semantic_level_t *l);extern void mls_semantic_level_destroy (mls_semantic_level_t *l); -extern int mls_semantic_level_cpy (mls_semantic_level_t *dst,mls_semantic_level_t *src); +extern int mls_semantic_level_cpy (mls_semantic_level_t *dst,const mls_semantic_level_t *src);extern void mls_semantic_range_init (mls_semantic_range_t *r);extern void mls_semantic_range_destroy (mls_semantic_range_t *r); -extern int mls_semantic_range_cpy (mls_semantic_range_t *dst,mls_semantic_range_t *src); +extern int mls_semantic_range_cpy (mls_semantic_range_t *dst,const mls_semantic_range_t *src); #ifdef __cplusplus }libsepol/src/mls.c +9
-8@@ -451,7 +451,7 @@ int mls_context_to_sid(const policydb_t * policydb,* Copies the MLS range from `src' into `dst'. */ static inline int mls_copy_context (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {int l, rc =0 ;@@ -471,7 +471,7 @@ static inline int mls_copy_context(context_struct_t * dst,* Copies the effective MLS range from `src' into `dst'. */ static inline int mls_scopy_context (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {int l, rc =0 ;@@ -490,7 +490,7 @@ static inline int mls_scopy_context(context_struct_t * dst,/* * Copies the MLS range `range' into `context'. */ -static inline int mls_range_set (context_struct_t * context,mls_range_t * range) +static inline int mls_range_set (context_struct_t * context,const mls_range_t * range) {int l, rc =0 ;@@ -601,8 +601,8 @@ int mls_convert_context(policydb_t * oldp, }int mls_compute_sid (policydb_t * policydb, -context_struct_t * scontext, -context_struct_t * tcontext, +const context_struct_t * scontext, +const context_struct_t * tcontext,sepol_security_class_t tclass,uint32_t specified,context_struct_t * newcontext) {@@ -755,9 +755,10 @@ void mls_semantic_level_destroy(mls_semantic_level_t * l) }int mls_semantic_level_cpy (mls_semantic_level_t * dst, -mls_semantic_level_t * src) +const mls_semantic_level_t * src) { -mls_semantic_cat_t *cat, *newcat, *lnewcat =NULL ; +const mls_semantic_cat_t *cat; +mls_semantic_cat_t *newcat, *lnewcat =NULL ;mls_semantic_level_init (dst); dst->sens = src->sens;@@ -800,7 +801,7 @@ void mls_semantic_range_destroy(mls_semantic_range_t * r) }int mls_semantic_range_cpy (mls_semantic_range_t * dst, -mls_semantic_range_t * src) +const mls_semantic_range_t * src) {if (mls_semantic_level_cpy (&dst->level[0 ], &src->level[0 ]) <0 )return -1 ;libsepol/src/mls.h +2
-3@@ -56,8 +56,8 @@ extern int mls_convert_context(policydb_t * oldp, policydb_t * newp, context_struct_t * context);extern int mls_compute_sid (policydb_t * policydb, -context_struct_t * scontext, -context_struct_t * tcontext, +const context_struct_t * scontext, +const context_struct_t * tcontext,sepol_security_class_t tclass,uint32_t specified,context_struct_t * newcontext); --2.35.1
Quoted 10 lines · James Carter
Quoted 5 lines · Christian Göttsche
Make it more obvious which parameters are read-only and not being modified and allow callers to pass const pointers.
Signed-off-by Christian Göttsche <[email protected]>For these two patches:
Acked-by James Carter <[email protected]>
Both merged, thanks!
Quoted 206 lines
Quoted 206 lines
--- libsepol/include/sepol/policydb/context.h | 14 +++++++------- libsepol/include/sepol/policydb/mls_types.h | 12 ++++++------ libsepol/src/mls.c | 17 +++++++++-------- libsepol/src/mls.h | 4 ++-- 4 files changed, 24 insertions(+), 23 deletions(-)libsepol/include/sepol/policydb/context.h +7
-7@@ -43,7 +43,7 @@ static inline void mls_context_init(context_struct_t * c) }static inline int mls_context_cpy (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {if (mls_range_cpy (&dst->range, &src->range) <0 )@@ -55,7 +55,7 @@ static inline int mls_context_cpy(context_struct_t * dst,/* * Sets both levels in the MLS range of 'dst' to the low level of 'src'. */ -static inline int mls_context_cpy_low (context_struct_t *dst,context_struct_t *src) +static inline int mls_context_cpy_low (context_struct_t *dst,const context_struct_t *src) {int rc;@@ -75,7 +75,7 @@ out:/* * Sets both levels in the MLS range of 'dst' to the high level of 'src'. */ -static inline int mls_context_cpy_high (context_struct_t *dst,context_struct_t *src) +static inline int mls_context_cpy_high (context_struct_t *dst,const context_struct_t *src) {int rc;@@ -92,12 +92,12 @@ out:return rc; } -static inline int mls_context_glblub (context_struct_t *dst,context_struct_t *c1,context_struct_t *c2) +static inline int mls_context_glblub (context_struct_t *dst,const context_struct_t *c1,const context_struct_t *c2) {return mls_range_glblub (&dst->range, &c1->range, &c2->range); } -static inline int mls_context_cmp (context_struct_t * c1,context_struct_t * c2) +static inline int mls_context_cmp (const context_struct_t * c1,const context_struct_t * c2) {return (mls_level_eq (&c1->range.level[0 ], &c2->range.level[0 ]) &&mls_level_eq (&c1->range.level[1 ], &c2->range.level[1 ]));@@ -118,7 +118,7 @@ static inline void context_init(context_struct_t * c)memset (c,0 ,sizeof (*c)); } -static inline int context_cpy (context_struct_t * dst,context_struct_t * src) +static inline int context_cpy (context_struct_t * dst,const context_struct_t * src) { dst->user = src->user; dst->role = src->role;@@ -135,7 +135,7 @@ static inline void context_destroy(context_struct_t * c)mls_context_destroy (c); } -static inline int context_cmp (context_struct_t * c1,context_struct_t * c2) +static inline int context_cmp (const context_struct_t * c1,const context_struct_t * c2) { return ((c1->user == c2->user) && (c1->role == c2->role) &&libsepol/include/sepol/policydb/mls_types.h +6
-6@@ -50,7 +50,7 @@ typedef struct mls_range {mls_level_t level[2 ];/* low == level[0], high == level[1] */ } mls_range_t; -static inline int mls_range_glblub (struct mls_range *dst,struct mls_range *r1,struct mls_range *r2) +static inline int mls_range_glblub (struct mls_range *dst,const struct mls_range *r1,const struct mls_range *r2) {if (r1->level[1 ].sens < r2->level[0 ].sens || r2->level[1 ].sens < r1->level[0 ].sens) {/* These ranges have no common sensitivities */ @@ -74,7 +74,7 @@ static inline int mls_range_glblub(struct mls_range *dst, struct mls_range *r1, } -static inline int mls_level_cpy (struct mls_level *dst,struct mls_level *src) +static inline int mls_level_cpy (struct mls_level *dst,const struct mls_level *src) { dst->sens = src->sens;@@ -119,7 +119,7 @@ static inline int mls_level_dom(const struct mls_level *l1, const struct mls_lev (mls_level_dom (&(r2).level[0 ], &(r1).level[0 ]) && \ mls_level_dom(&(r1).level[1], &(r2).level[1])) -static inline int mls_range_cpy (mls_range_t * dst,mls_range_t * src) +static inline int mls_range_cpy (mls_range_t * dst,const mls_range_t * src) {if (mls_level_cpy (&dst->level[0 ], &src->level[0 ]) <0 )@@ -149,7 +149,7 @@ static inline void mls_range_destroy(struct mls_range *r)mls_level_destroy (&r->level[1 ]); } -static inline int mls_range_eq (struct mls_range *r1,struct mls_range *r2) +static inline int mls_range_eq (const struct mls_range *r1,const struct mls_range *r2) {return (mls_level_eq (&r1->level[0 ], &r2->level[0 ]) &&mls_level_eq (&r1->level[1 ], &r2->level[1 ]));@@ -174,10 +174,10 @@ extern void mls_semantic_cat_init(mls_semantic_cat_t *c);extern void mls_semantic_cat_destroy (mls_semantic_cat_t *c);extern void mls_semantic_level_init (mls_semantic_level_t *l);extern void mls_semantic_level_destroy (mls_semantic_level_t *l); -extern int mls_semantic_level_cpy (mls_semantic_level_t *dst,mls_semantic_level_t *src); +extern int mls_semantic_level_cpy (mls_semantic_level_t *dst,const mls_semantic_level_t *src);extern void mls_semantic_range_init (mls_semantic_range_t *r);extern void mls_semantic_range_destroy (mls_semantic_range_t *r); -extern int mls_semantic_range_cpy (mls_semantic_range_t *dst,mls_semantic_range_t *src); +extern int mls_semantic_range_cpy (mls_semantic_range_t *dst,const mls_semantic_range_t *src); #ifdef __cplusplus }libsepol/src/mls.c +9
-8@@ -451,7 +451,7 @@ int mls_context_to_sid(const policydb_t * policydb,* Copies the MLS range from `src' into `dst'. */ static inline int mls_copy_context (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {int l, rc =0 ;@@ -471,7 +471,7 @@ static inline int mls_copy_context(context_struct_t * dst,* Copies the effective MLS range from `src' into `dst'. */ static inline int mls_scopy_context (context_struct_t * dst, -context_struct_t * src) +const context_struct_t * src) {int l, rc =0 ;@@ -490,7 +490,7 @@ static inline int mls_scopy_context(context_struct_t * dst,/* * Copies the MLS range `range' into `context'. */ -static inline int mls_range_set (context_struct_t * context,mls_range_t * range) +static inline int mls_range_set (context_struct_t * context,const mls_range_t * range) {int l, rc =0 ;@@ -601,8 +601,8 @@ int mls_convert_context(policydb_t * oldp, }int mls_compute_sid (policydb_t * policydb, -context_struct_t * scontext, -context_struct_t * tcontext, +const context_struct_t * scontext, +const context_struct_t * tcontext,sepol_security_class_t tclass,uint32_t specified,context_struct_t * newcontext) {@@ -755,9 +755,10 @@ void mls_semantic_level_destroy(mls_semantic_level_t * l) }int mls_semantic_level_cpy (mls_semantic_level_t * dst, -mls_semantic_level_t * src) +const mls_semantic_level_t * src) { -mls_semantic_cat_t *cat, *newcat, *lnewcat =NULL ; +const mls_semantic_cat_t *cat; +mls_semantic_cat_t *newcat, *lnewcat =NULL ;mls_semantic_level_init (dst); dst->sens = src->sens;@@ -800,7 +801,7 @@ void mls_semantic_range_destroy(mls_semantic_range_t * r) }int mls_semantic_range_cpy (mls_semantic_range_t * dst, -mls_semantic_range_t * src) +const mls_semantic_range_t * src) {if (mls_semantic_level_cpy (&dst->level[0 ], &src->level[0 ]) <0 )return -1 ;libsepol/src/mls.h +2
-3@@ -56,8 +56,8 @@ extern int mls_convert_context(policydb_t * oldp, policydb_t * newp, context_struct_t * context);extern int mls_compute_sid (policydb_t * policydb, -context_struct_t * scontext, -context_struct_t * tcontext, +const context_struct_t * scontext, +const context_struct_t * tcontext,sepol_security_class_t tclass,uint32_t specified,context_struct_t * newcontext); --2.35.1