mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

selinux: avoid implicit conversions in policydb code 

Use the identical type for local variables, e.g. loop counters.

Declare members of struct policydb_compat_info unsigned to consistently
use unsigned iterators.  They hold read-only non-negative numbers in the
global variable policydb_compat.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Christian Göttsche 2023-08-07 19:11:40 +02:00 committed by Paul Moore
parent 97842c56b8
commit dee1537548
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
security/selinux/ss/policydb.c
View File

@ -55,9 +55,9 @@ static const char *const symtab_name[SYM_NUM] = {
#endif
struct policydb_compat_info {
int version;
int sym_num;
int ocon_num;
unsigned int version;
unsigned int sym_num;
unsigned int ocon_num;
};
/* These need to be updated if SYM_NUM or OCON_NUM changes */
@ -159,9 +159,9 @@ static const struct policydb_compat_info policydb_compat[] = {
},
};
static const struct policydb_compat_info *policydb_lookup_compat(int version)
static const struct policydb_compat_info *policydb_lookup_compat(unsigned int version)
{
int i;
unsigned int i;
for (i = 0; i < ARRAY_SIZE(policydb_compat); i++) {
if (policydb_compat[i].version == version)
@ -359,7 +359,7 @@ static int role_tr_destroy(void *key, void *datum, void *p)
return 0;
}
static void ocontext_destroy(struct ocontext *c, int i)
static void ocontext_destroy(struct ocontext *c, unsigned int i)
{
if (!c)
return;
@ -782,7 +782,7 @@ void policydb_destroy(struct policydb *p)
{
struct ocontext *c, *ctmp;
struct genfs *g, *gtmp;
int i;
u32 i;
struct role_allow *ra, *lra = NULL;
for (i = 0; i < SYM_NUM; i++) {
@ -1128,8 +1128,8 @@ static int common_read(struct policydb *p, struct symtab *s, void *fp)
char *key = NULL;
struct common_datum *comdatum;
__le32 buf[4];
u32 len, nel;
int i, rc;
u32 i, len, nel;
int rc;
comdatum = kzalloc(sizeof(*comdatum), GFP_KERNEL);
if (!comdatum)
@ -1194,13 +1194,13 @@ static int type_set_read(struct type_set *t, void *fp)
static int read_cons_helper(struct policydb *p,
struct constraint_node **nodep,
int ncons, int allowxtarget, void *fp)
u32 ncons, int allowxtarget, void *fp)
{
struct constraint_node *c, *lc;
struct constraint_expr *e, *le;
__le32 buf[3];
u32 nexpr;
int rc, i, j, depth;
u32 i, j, nexpr;
int rc, depth;
lc = NULL;
for (i = 0; i < ncons; i++) {
@ -1292,8 +1292,8 @@ static int class_read(struct policydb *p, struct symtab *s, void *fp)
char *key = NULL;
struct class_datum *cladatum;
__le32 buf[6];
u32 len, len2, ncons, nel;
int i, rc;
u32 i, len, len2, ncons, nel;
int rc;
cladatum = kzalloc(sizeof(*cladatum), GFP_KERNEL);
if (!cladatum)
@ -1386,7 +1386,8 @@ static int role_read(struct policydb *p, struct symtab *s, void *fp)
{
char *key = NULL;
struct role_datum *role;
int rc, to_read = 2;
int rc;
unsigned int to_read = 2;
__le32 buf[3];
u32 len;
@ -1442,7 +1443,8 @@ static int type_read(struct policydb *p, struct symtab *s, void *fp)
{
char *key = NULL;
struct type_datum *typdatum;
int rc, to_read = 3;
int rc;
unsigned int to_read = 3;
__le32 buf[4];
u32 len;
@ -1516,7 +1518,8 @@ static int user_read(struct policydb *p, struct symtab *s, void *fp)
{
char *key = NULL;
struct user_datum *usrdatum;
int rc, to_read = 2;
int rc;
unsigned int to_read = 2;
__le32 buf[3];
u32 len;
@ -1657,7 +1660,7 @@ static int user_bounds_sanity_check(void *key, void *datum, void *datap)
upper = user = datum;
while (upper->bounds) {
struct ebitmap_node *node;
unsigned long bit;
u32 bit;
if (++depth == POLICYDB_BOUNDS_MAXDEPTH) {
pr_err("SELinux: user %s: "
@ -1693,7 +1696,7 @@ static int role_bounds_sanity_check(void *key, void *datum, void *datap)
upper = role = datum;
while (upper->bounds) {
struct ebitmap_node *node;
unsigned long bit;
u32 bit;
if (++depth == POLICYDB_BOUNDS_MAXDEPTH) {
pr_err("SELinux: role %s: "
@ -1808,9 +1811,9 @@ static int range_read(struct policydb *p, void *fp)
{
struct range_trans *rt = NULL;
struct mls_range *r = NULL;
int i, rc;
int rc;
__le32 buf[2];
u32 nel;
u32 i, nel;
if (p->policyvers < POLICYDB_VERSION_MLS)
return 0;
@ -2056,9 +2059,9 @@ out:
static int filename_trans_read(struct policydb *p, void *fp)
{
u32 nel;
u32 nel, i;
__le32 buf[1];
int rc, i;
int rc;
if (p->policyvers < POLICYDB_VERSION_FILENAME_TRANS)
return 0;
@ -2097,8 +2100,8 @@ static int filename_trans_read(struct policydb *p, void *fp)
static int genfs_read(struct policydb *p, void *fp)
{
int i, j, rc;
u32 nel, nel2, len, len2;
int rc;
u32 i, j, nel, nel2, len, len2;
__le32 buf[1];
struct ocontext *l, *c;
struct ocontext *newc = NULL;
@ -2211,8 +2214,9 @@ out:
static int ocontext_read(struct policydb *p, const struct policydb_compat_info *info,
void *fp)
{
int i, j, rc;
u32 nel, len;
int rc;
unsigned int i;
u32 j, nel, len;
__be64 prefixbuf[1];
__le32 buf[3];
struct ocontext *l, *c;
@ -2403,9 +2407,9 @@ int policydb_read(struct policydb *p, void *fp)
struct role_allow *ra, *lra;
struct role_trans_key *rtk = NULL;
struct role_trans_datum *rtd = NULL;
int i, j, rc;
int rc;
__le32 buf[4];
u32 len, nprim, nel, perm;
u32 i, j, len, nprim, nel, perm;
char *policydb_str;
const struct policydb_compat_info *info;
@ -3256,7 +3260,8 @@ static int (*const write_f[SYM_NUM]) (void *key, void *datum, void *datap) = {
static int ocontext_write(struct policydb *p, const struct policydb_compat_info *info,
void *fp)
{
unsigned int i, j, rc;
unsigned int i, j;
int rc;
size_t nel, len;
__be64 prefixbuf[1];
__le32 buf[3];
@ -3605,10 +3610,10 @@ static int filename_trans_write(struct policydb *p, void *fp)
*/
int policydb_write(struct policydb *p, void *fp)
{
unsigned int i, num_syms;
unsigned int num_syms;
int rc;
__le32 buf[4];
u32 config;
u32 config, i;
size_t len;
const struct policydb_compat_info *info;