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

libsepol: declare read-only arrays const

Browse source 
Make it more apparent that those data does not change and enforce it.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
Christian Göttsche 2021-06-08 17:59:12 +02:00 committed by James Carter
parent 4572bf254a
commit 9fb8df7f16
8 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libsepol/src/avrule_block.c
View file

@ -30,7 +30,7 @@
/* It is anticipated that there be less declarations within an avrule
* block than the global policy. Thus the symbol table sizes are
* smaller than those listed in policydb.c */
static unsigned int symtab_sizes[SYM_NUM] = {
static const unsigned int symtab_sizes[SYM_NUM] = {
2,
4,
8,

2
libsepol/src/avtab.c
View file

@ -418,7 +418,7 @@ void avtab_hash_eval(avtab_t * h, char *tag)
}
/* Ordering of datums in the original avtab format in the policy file. */
static uint16_t spec_order[] = {
static const uint16_t spec_order[] = {
AVTAB_ALLOWED,
AVTAB_AUDITDENY,
AVTAB_AUDITALLOW,

2
libsepol/src/link.c
View file

@ -78,7 +78,7 @@ typedef struct missing_requirement {
uint32_t perm_value;
} missing_requirement_t;
static const char *symtab_names[SYM_NUM] = {
static const char * const symtab_names[SYM_NUM] = {
"common", "class", "role", "type/attribute", "user",
"bool", "level", "category"
};

2
libsepol/src/polcaps.c
View file

@ -5,7 +5,7 @@
#include <string.h>
#include <sepol/policydb/polcaps.h>
static const char *polcap_names[] = {
static const char * const polcap_names[] = {
"network_peer_controls", /* POLICYDB_CAPABILITY_NETPEER */
"open_perms", /* POLICYDB_CAPABILITY_OPENPERM */
"extended_socket_class", /* POLICYDB_CAPABILITY_EXTSOCKCLASS */

22
libsepol/src/policydb.c
View file

@ -57,10 +57,10 @@
#include "policydb_validate.h"
#define POLICYDB_TARGET_SZ ARRAY_SIZE(policydb_target_strings)
const char *policydb_target_strings[] = { POLICYDB_STRING, POLICYDB_XEN_STRING };
const char * const policydb_target_strings[] = { POLICYDB_STRING, POLICYDB_XEN_STRING };
/* These need to be updated if SYM_NUM or OCON_NUM changes */
static struct policydb_compat_info policydb_compat[] = {
static const struct policydb_compat_info policydb_compat[] = {
{
.type = POLICY_KERN,
.version = POLICYDB_VERSION_BOUNDARY,
@ -460,7 +460,7 @@ static char *symtab_name[SYM_NUM] = {
};
#endif
static unsigned int symtab_sizes[SYM_NUM] = {
static const unsigned int symtab_sizes[SYM_NUM] = {
2,
32,
16,
@ -471,12 +471,12 @@ static unsigned int symtab_sizes[SYM_NUM] = {
16,
};
struct policydb_compat_info *policydb_lookup_compat(unsigned int version,
unsigned int type,
unsigned int target_platform)
const struct policydb_compat_info *policydb_lookup_compat(unsigned int version,
unsigned int type,
unsigned int target_platform)
{
unsigned int i;
struct policydb_compat_info *info = NULL;
const struct policydb_compat_info *info = NULL;
for (i = 0; i < sizeof(policydb_compat) / sizeof(*info); i++) {
if (policydb_compat[i].version == version &&
@ -2848,7 +2848,7 @@ static int filename_trans_read(policydb_t *p, struct policy_file *fp)
return 0;
}
static int ocontext_read_xen(struct policydb_compat_info *info,
static int ocontext_read_xen(const struct policydb_compat_info *info,
policydb_t *p, struct policy_file *fp)
{
unsigned int i, j;
@ -2957,7 +2957,7 @@ static int ocontext_read_xen(struct policydb_compat_info *info,
}
return 0;
}
static int ocontext_read_selinux(struct policydb_compat_info *info,
static int ocontext_read_selinux(const struct policydb_compat_info *info,
policydb_t * p, struct policy_file *fp)
{
unsigned int i, j;
@ -3135,7 +3135,7 @@ static int ocontext_read_selinux(struct policydb_compat_info *info,
return 0;
}
static int ocontext_read(struct policydb_compat_info *info,
static int ocontext_read(const struct policydb_compat_info *info,
policydb_t *p, struct policy_file *fp)
{
int rc = -1;
@ -4192,7 +4192,7 @@ int policydb_read(policydb_t * p, struct policy_file *fp, unsigned verbose)
uint32_t buf[5];
size_t len, nprim, nel;
char *policydb_str;
struct policydb_compat_info *info;
const struct policydb_compat_info *info;
unsigned int policy_type, bufindex;
ebitmap_node_t *tnode;
int rc;

2
libsepol/src/policydb_internal.h
View file

@ -3,5 +3,5 @@
#include <sepol/policydb.h>
extern const char *policydb_target_strings[];
extern const char * const policydb_target_strings[];
#endif

6
libsepol/src/private.h
View file

@ -56,9 +56,9 @@ struct policydb_compat_info {
unsigned int target_platform;
};
extern struct policydb_compat_info *policydb_lookup_compat(unsigned int version,
unsigned int type,
unsigned int target_platform);
extern const struct policydb_compat_info *policydb_lookup_compat(unsigned int version,
unsigned int type,
unsigned int target_platform);
/* Reading from a policy "file". */
extern int next_entry(void *buf, struct policy_file *fp, size_t bytes);

8
libsepol/src/write.c
View file

@ -1345,7 +1345,7 @@ static int (*write_f[SYM_NUM]) (hashtab_key_t key, hashtab_datum_t datum,
common_write, class_write, role_write, type_write, user_write,
cond_write_bool, sens_write, cat_write,};
static int ocontext_write_xen(struct policydb_compat_info *info, policydb_t *p,
static int ocontext_write_xen(const struct policydb_compat_info *info, policydb_t *p,
struct policy_file *fp)
{
unsigned int i, j;
@ -1453,7 +1453,7 @@ static int ocontext_write_xen(struct policydb_compat_info *info, policydb_t *p,
return POLICYDB_SUCCESS;
}
static int ocontext_write_selinux(struct policydb_compat_info *info,
static int ocontext_write_selinux(const struct policydb_compat_info *info,
policydb_t *p, struct policy_file *fp)
{
unsigned int i, j;
@ -1583,7 +1583,7 @@ static int ocontext_write_selinux(struct policydb_compat_info *info,
return POLICYDB_SUCCESS;
}
static int ocontext_write(struct policydb_compat_info *info, policydb_t * p,
static int ocontext_write(const struct policydb_compat_info *info, policydb_t * p,
struct policy_file *fp)
{
int rc = POLICYDB_ERROR;
@ -2179,7 +2179,7 @@ int policydb_write(policydb_t * p, struct policy_file *fp)
unsigned int i, num_syms;
uint32_t buf[32], config;
size_t items, items2, len;
struct policydb_compat_info *info;
const struct policydb_compat_info *info;
struct policy_data pd;
const char *policydb_str;