tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

checkpolicy: mark read-only parameters in module compiler const

Browse source 
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 <cgzones@googlemail.com>
This commit is contained in:
Christian Göttsche 2021-09-14 14:48:21 +02:00 committed by James Carter
parent 9eebc4b731
commit 6388cfe7f3
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
checkpolicy/module_compiler.c
View file

@ -1104,14 +1104,14 @@ int require_cat(int pass)
return 0; return 0;
} }
static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack) static int is_scope_in_stack(const scope_datum_t * scope, const scope_stack_t * stack)
{ {
uint32_t i; uint32_t i;
if (stack == NULL) { if (stack == NULL) {
return 0; /* no matching scope found */ return 0; /* no matching scope found */
} }
if (stack->type == 1) { if (stack->type == 1) {
avrule_decl_t *decl = stack->decl; const avrule_decl_t *decl = stack->decl;
for (i = 0; i < scope->decl_ids_len; i++) { for (i = 0; i < scope->decl_ids_len; i++) {
if (scope->decl_ids[i] == decl->decl_id) { if (scope->decl_ids[i] == decl->decl_id) {
return 1; return 1;
@ -1126,9 +1126,9 @@ static int is_scope_in_stack(scope_datum_t * scope, scope_stack_t * stack)
return is_scope_in_stack(scope, stack->parent); return is_scope_in_stack(scope, stack->parent);
} }
int is_id_in_scope(uint32_t symbol_type, hashtab_key_t id) int is_id_in_scope(uint32_t symbol_type, const_hashtab_key_t id)
{ {
scope_datum_t *scope = const scope_datum_t *scope =
(scope_datum_t *) hashtab_search(policydbp->scope[symbol_type]. (scope_datum_t *) hashtab_search(policydbp->scope[symbol_type].
table, id); table, id);
if (scope == NULL) { if (scope == NULL) {
@ -1138,7 +1138,7 @@ int is_id_in_scope(uint32_t symbol_type, hashtab_key_t id)
} }
static int is_perm_in_scope_index(uint32_t perm_value, uint32_t class_value, static int is_perm_in_scope_index(uint32_t perm_value, uint32_t class_value,
scope_index_t * scope) const scope_index_t * scope)
{ {
if (class_value > scope->class_perms_len) { if (class_value > scope->class_perms_len) {
return 1; return 1;
@ -1151,7 +1151,7 @@ static int is_perm_in_scope_index(uint32_t perm_value, uint32_t class_value,
} }
static int is_perm_in_stack(uint32_t perm_value, uint32_t class_value, static int is_perm_in_stack(uint32_t perm_value, uint32_t class_value,
scope_stack_t * stack) const scope_stack_t * stack)
{ {
if (stack == NULL) { if (stack == NULL) {
return 0; /* no matching scope found */ return 0; /* no matching scope found */
@ -1173,12 +1173,12 @@ static int is_perm_in_stack(uint32_t perm_value, uint32_t class_value,
return is_perm_in_stack(perm_value, class_value, stack->parent); return is_perm_in_stack(perm_value, class_value, stack->parent);
} }
int is_perm_in_scope(hashtab_key_t perm_id, hashtab_key_t class_id) int is_perm_in_scope(const_hashtab_key_t perm_id, const_hashtab_key_t class_id)
{ {
class_datum_t *cladatum = const class_datum_t *cladatum =
(class_datum_t *) hashtab_search(policydbp->p_classes.table, (class_datum_t *) hashtab_search(policydbp->p_classes.table,
class_id); class_id);
perm_datum_t *perdatum; const perm_datum_t *perdatum;
if (cladatum == NULL) { if (cladatum == NULL) {
return 1; return 1;
} }
@ -1361,17 +1361,17 @@ int begin_optional_else(int pass)
return 0; return 0;
} }
static int copy_requirements(avrule_decl_t * dest, scope_stack_t * stack) static int copy_requirements(avrule_decl_t * dest, const scope_stack_t * stack)
{ {
uint32_t i; uint32_t i;
if (stack == NULL) { if (stack == NULL) {
return 0; return 0;
} }
if (stack->type == 1) { if (stack->type == 1) {
scope_index_t *src_scope = &stack->decl->required; const scope_index_t *src_scope = &stack->decl->required;
scope_index_t *dest_scope = &dest->required; scope_index_t *dest_scope = &dest->required;
for (i = 0; i < SYM_NUM; i++) { for (i = 0; i < SYM_NUM; i++) {
ebitmap_t *src_bitmap = &src_scope->scope[i]; const ebitmap_t *src_bitmap = &src_scope->scope[i];
ebitmap_t *dest_bitmap = &dest_scope->scope[i]; ebitmap_t *dest_bitmap = &dest_scope->scope[i];
if (ebitmap_union(dest_bitmap, src_bitmap)) { if (ebitmap_union(dest_bitmap, src_bitmap)) {
yyerror("Out of memory!"); yyerror("Out of memory!");
@ -1397,7 +1397,7 @@ static int copy_requirements(avrule_decl_t * dest, scope_stack_t * stack)
src_scope->class_perms_len; src_scope->class_perms_len;
} }
for (i = 0; i < src_scope->class_perms_len; i++) { for (i = 0; i < src_scope->class_perms_len; i++) {
ebitmap_t *src_bitmap = &src_scope->class_perms_map[i]; const ebitmap_t *src_bitmap = &src_scope->class_perms_map[i];
ebitmap_t *dest_bitmap = ebitmap_t *dest_bitmap =
&dest_scope->class_perms_map[i]; &dest_scope->class_perms_map[i];
if (ebitmap_union(dest_bitmap, src_bitmap)) { if (ebitmap_union(dest_bitmap, src_bitmap)) {

4
checkpolicy/module_compiler.h
View file

@ -65,12 +65,12 @@ int require_cat(int pass);
/* Check if an identifier is within the scope of the current /* Check if an identifier is within the scope of the current
* declaration or any of its parents. Return 1 if it is, 0 if not. * declaration or any of its parents. Return 1 if it is, 0 if not.
* If the identifier is not known at all then return 1 (truth). */ * If the identifier is not known at all then return 1 (truth). */
int is_id_in_scope(uint32_t symbol_type, hashtab_key_t id); int is_id_in_scope(uint32_t symbol_type, const_hashtab_key_t id);
/* Check if a particular permission is within the scope of the current /* Check if a particular permission is within the scope of the current
* declaration or any of its parents. Return 1 if it is, 0 if not. * declaration or any of its parents. Return 1 if it is, 0 if not.
* If the identifier is not known at all then return 1 (truth). */ * If the identifier is not known at all then return 1 (truth). */
int is_perm_in_scope(hashtab_key_t perm_id, hashtab_key_t class_id); int is_perm_in_scope(const_hashtab_key_t perm_id, const_hashtab_key_t class_id);
/* Search the current avrules block for a conditional with the same /* Search the current avrules block for a conditional with the same
* expression as 'cond'. If the conditional does not exist then * expression as 'cond'. If the conditional does not exist then