selinux: use known type instead of void pointer

cgzones · pcmoore · commit f07586160fd5 · 2025-01-07T23:14:39.000-05:00
Improve type safety and readability by using the known type.

Signed-off-by: Christian Göttsche &lt;cgzones@googlemail.com&gt;
Signed-off-by: Paul Moore &lt;paul@paul-moore.com&gt;
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c
@@ -336,7 +336,7 @@ static const uint16_t spec_order[] = {
 };
 /* clang-format on */
 
-int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
+int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *pol,
 		    int (*insertf)(struct avtab *a, const struct avtab_key *k,
 				   const struct avtab_datum *d, void *p),
 		    void *p, bool conditional)
@@ -507,7 +507,7 @@ static int avtab_insertf(struct avtab *a, const struct avtab_key *k,
 	return avtab_insert(a, k, d);
 }
 
-int avtab_read(struct avtab *a, void *fp, struct policydb *pol)
+int avtab_read(struct avtab *a, struct policy_file *fp, struct policydb *pol)
 {
 	int rc;
 	__le32 buf[1];
@@ -550,7 +550,7 @@ int avtab_read(struct avtab *a, void *fp, struct policydb *pol)
 	goto out;
 }
 
-int avtab_write_item(struct policydb *p, const struct avtab_node *cur, void *fp)
+int avtab_write_item(struct policydb *p, const struct avtab_node *cur, struct policy_file *fp)
 {
 	__le16 buf16[4];
 	__le32 buf32[ARRAY_SIZE(cur->datum.u.xperms->perms.p)];
@@ -586,7 +586,7 @@ int avtab_write_item(struct policydb *p, const struct avtab_node *cur, void *fp)
 	return 0;
 }
 
-int avtab_write(struct policydb *p, struct avtab *a, void *fp)
+int avtab_write(struct policydb *p, struct avtab *a, struct policy_file *fp)
 {
 	u32 i;
 	int rc = 0;
diff --git a/security/selinux/ss/avtab.h b/security/selinux/ss/avtab.h
@@ -105,15 +105,16 @@ static inline void avtab_hash_eval(struct avtab *h, const char *tag)
 #endif
 
 struct policydb;
-int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
+struct policy_file;
+int avtab_read_item(struct avtab *a, struct policy_file *fp, struct policydb *pol,
 		    int (*insert)(struct avtab *a, const struct avtab_key *k,
 				  const struct avtab_datum *d, void *p),
 		    void *p, bool conditional);
 
-int avtab_read(struct avtab *a, void *fp, struct policydb *pol);
+int avtab_read(struct avtab *a, struct policy_file *fp, struct policydb *pol);
 int avtab_write_item(struct policydb *p, const struct avtab_node *cur,
-		     void *fp);
-int avtab_write(struct policydb *p, struct avtab *a, void *fp);
+		     struct policy_file *fp);
+int avtab_write(struct policydb *p, struct avtab *a, struct policy_file *fp);
 
 struct avtab_node *avtab_insert_nonunique(struct avtab *h,
 					  const struct avtab_key *key,
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
@@ -206,7 +206,7 @@ static int bool_isvalid(struct cond_bool_datum *b)
 	return 1;
 }
 
-int cond_read_bool(struct policydb *p, struct symtab *s, void *fp)
+int cond_read_bool(struct policydb *p, struct symtab *s, struct policy_file *fp)
 {
 	char *key = NULL;
 	struct cond_bool_datum *booldatum;
@@ -323,7 +323,7 @@ static int cond_insertf(struct avtab *a, const struct avtab_key *k,
 	return 0;
 }
 
-static int cond_read_av_list(struct policydb *p, void *fp,
+static int cond_read_av_list(struct policydb *p, struct policy_file *fp,
 			     struct cond_av_list *list,
 			     struct cond_av_list *other)
 {
@@ -375,7 +375,7 @@ static int expr_node_isvalid(struct policydb *p, struct cond_expr_node *expr)
 	return 1;
 }
 
-static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp)
+static int cond_read_node(struct policydb *p, struct cond_node *node, struct policy_file *fp)
 {
 	__le32 buf[2];
 	u32 i, len;
@@ -415,7 +415,7 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp)
 	return cond_read_av_list(p, fp, &node->false_list, &node->true_list);
 }
 
-int cond_read_list(struct policydb *p, void *fp)
+int cond_read_list(struct policydb *p, struct policy_file *fp)
 {
 	__le32 buf[1];
 	u32 i, len;
@@ -453,7 +453,7 @@ int cond_write_bool(void *vkey, void *datum, void *ptr)
 	char *key = vkey;
 	struct cond_bool_datum *booldatum = datum;
 	struct policy_data *pd = ptr;
-	void *fp = pd->fp;
+	struct policy_file *fp = pd->fp;
 	__le32 buf[3];
 	u32 len;
 	int rc;
@@ -536,7 +536,7 @@ static int cond_write_node(struct policydb *p, struct cond_node *node,
 	return 0;
 }
 
-int cond_write_list(struct policydb *p, void *fp)
+int cond_write_list(struct policydb *p, struct policy_file *fp)
 {
 	u32 i;
 	__le32 buf[1];
diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h
@@ -68,10 +68,10 @@ int cond_destroy_bool(void *key, void *datum, void *p);
 
 int cond_index_bool(void *key, void *datum, void *datap);
 
-int cond_read_bool(struct policydb *p, struct symtab *s, void *fp);
-int cond_read_list(struct policydb *p, void *fp);
+int cond_read_bool(struct policydb *p, struct symtab *s, struct policy_file *fp);
+int cond_read_list(struct policydb *p, struct policy_file *fp);
 int cond_write_bool(void *key, void *datum, void *ptr);
-int cond_write_list(struct policydb *p, void *fp);
+int cond_write_list(struct policydb *p, struct policy_file *fp);
 
 void cond_compute_av(struct avtab *ctab, struct avtab_key *key,
 		     struct av_decision *avd, struct extended_perms *xperms);
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c
@@ -360,7 +360,7 @@ void ebitmap_destroy(struct ebitmap *e)
 	e->node = NULL;
 }
 
-int ebitmap_read(struct ebitmap *e, void *fp)
+int ebitmap_read(struct ebitmap *e, struct policy_file *fp)
 {
 	struct ebitmap_node *n = NULL;
 	u32 mapunit, count, startbit, index, i;
@@ -478,7 +478,7 @@ int ebitmap_read(struct ebitmap *e, void *fp)
 	goto out;
 }
 
-int ebitmap_write(const struct ebitmap *e, void *fp)
+int ebitmap_write(const struct ebitmap *e, struct policy_file *fp)
 {
 	struct ebitmap_node *n;
 	u32 bit, count, last_bit, last_startbit;
diff --git a/security/selinux/ss/ebitmap.h b/security/selinux/ss/ebitmap.h
@@ -129,8 +129,9 @@ int ebitmap_contains(const struct ebitmap *e1, const struct ebitmap *e2,
 int ebitmap_get_bit(const struct ebitmap *e, u32 bit);
 int ebitmap_set_bit(struct ebitmap *e, u32 bit, int value);
 void ebitmap_destroy(struct ebitmap *e);
-int ebitmap_read(struct ebitmap *e, void *fp);
-int ebitmap_write(const struct ebitmap *e, void *fp);
+struct policy_file;
+int ebitmap_read(struct ebitmap *e, struct policy_file *fp);
+int ebitmap_write(const struct ebitmap *e, struct policy_file *fp);
 u32 ebitmap_hash(const struct ebitmap *e, u32 hash);
 
 #ifdef CONFIG_NETLABEL
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
diff --git a/security/selinux/ss/policydb.h b/security/selinux/ss/policydb.h

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ static const uint16_t spec_order[] = {`
`336`	`336`	`};`
`337`	`337`	`/* clang-format on */`
`338`	`338`
`339`		`-int avtab_read_item(struct avtab a, void fp, struct policydb *pol,`
	`339`	`+int avtab_read_item(struct avtab a, struct policy_file fp, struct policydb *pol,`
`340`	`340`	`int (insertf)(struct avtab a, const struct avtab_key *k,`
`341`	`341`	`const struct avtab_datum d, void p),`
`342`	`342`	`void *p, bool conditional)`
`@@ -507,7 +507,7 @@ static int avtab_insertf(struct avtab a, const struct avtab_key k,`
`507`	`507`	`return avtab_insert(a, k, d);`
`508`	`508`	`}`
`509`	`509`
`510`		`-int avtab_read(struct avtab a, void fp, struct policydb *pol)`
	`510`	`+int avtab_read(struct avtab a, struct policy_file fp, struct policydb *pol)`
`511`	`511`	`{`
`512`	`512`	`int rc;`
`513`	`513`	`__le32 buf[1];`
`@@ -550,7 +550,7 @@ int avtab_read(struct avtab a, void fp, struct policydb *pol)`
`550`	`550`	`goto out;`
`551`	`551`	`}`
`552`	`552`
`553`		`-int avtab_write_item(struct policydb p, const struct avtab_node cur, void *fp)`
	`553`	`+int avtab_write_item(struct policydb p, const struct avtab_node cur, struct policy_file *fp)`
`554`	`554`	`{`
`555`	`555`	`__le16 buf16[4];`
`556`	`556`	`__le32 buf32[ARRAY_SIZE(cur->datum.u.xperms->perms.p)];`
`@@ -586,7 +586,7 @@ int avtab_write_item(struct policydb p, const struct avtab_node cur, void *fp)`
`586`	`586`	`return 0;`
`587`	`587`	`}`
`588`	`588`
`589`		`-int avtab_write(struct policydb p, struct avtab a, void *fp)`
	`589`	`+int avtab_write(struct policydb p, struct avtab a, struct policy_file *fp)`
`590`	`590`	`{`
`591`	`591`	`u32 i;`
`592`	`592`	`int rc = 0;`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ static int bool_isvalid(struct cond_bool_datum *b)`
`206`	`206`	`return 1;`
`207`	`207`	`}`
`208`	`208`
`209`		`-int cond_read_bool(struct policydb p, struct symtab s, void *fp)`
	`209`	`+int cond_read_bool(struct policydb p, struct symtab s, struct policy_file *fp)`
`210`	`210`	`{`
`211`	`211`	`char *key = NULL;`
`212`	`212`	`struct cond_bool_datum *booldatum;`
`@@ -323,7 +323,7 @@ static int cond_insertf(struct avtab a, const struct avtab_key k,`
`323`	`323`	`return 0;`
`324`	`324`	`}`
`325`	`325`
`326`		`-static int cond_read_av_list(struct policydb p, void fp,`
	`326`	`+static int cond_read_av_list(struct policydb p, struct policy_file fp,`
`327`	`327`	`struct cond_av_list *list,`
`328`	`328`	`struct cond_av_list *other)`
`329`	`329`	`{`
`@@ -375,7 +375,7 @@ static int expr_node_isvalid(struct policydb p, struct cond_expr_node expr)`
`375`	`375`	`return 1;`
`376`	`376`	`}`
`377`	`377`
`378`		`-static int cond_read_node(struct policydb p, struct cond_node node, void *fp)`
	`378`	`+static int cond_read_node(struct policydb p, struct cond_node node, struct policy_file *fp)`
`379`	`379`	`{`
`380`	`380`	`__le32 buf[2];`
`381`	`381`	`u32 i, len;`
`@@ -415,7 +415,7 @@ static int cond_read_node(struct policydb p, struct cond_node node, void *fp)`
`415`	`415`	`return cond_read_av_list(p, fp, &node->false_list, &node->true_list);`
`416`	`416`	`}`
`417`	`417`
`418`		`-int cond_read_list(struct policydb p, void fp)`
	`418`	`+int cond_read_list(struct policydb p, struct policy_file fp)`
`419`	`419`	`{`
`420`	`420`	`__le32 buf[1];`
`421`	`421`	`u32 i, len;`
`@@ -453,7 +453,7 @@ int cond_write_bool(void vkey, void datum, void *ptr)`
`453`	`453`	`char *key = vkey;`
`454`	`454`	`struct cond_bool_datum *booldatum = datum;`
`455`	`455`	`struct policy_data *pd = ptr;`
`456`		`- void *fp = pd->fp;`
	`456`	`+ struct policy_file *fp = pd->fp;`
`457`	`457`	`__le32 buf[3];`
`458`	`458`	`u32 len;`
`459`	`459`	`int rc;`
`@@ -536,7 +536,7 @@ static int cond_write_node(struct policydb p, struct cond_node node,`
`536`	`536`	`return 0;`
`537`	`537`	`}`
`538`	`538`
`539`		`-int cond_write_list(struct policydb p, void fp)`
	`539`	`+int cond_write_list(struct policydb p, struct policy_file fp)`
`540`	`540`	`{`
`541`	`541`	`u32 i;`
`542`	`542`	`__le32 buf[1];`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ void ebitmap_destroy(struct ebitmap *e)`
`360`	`360`	`e->node = NULL;`
`361`	`361`	`}`
`362`	`362`
`363`		`-int ebitmap_read(struct ebitmap e, void fp)`
	`363`	`+int ebitmap_read(struct ebitmap e, struct policy_file fp)`
`364`	`364`	`{`
`365`	`365`	`struct ebitmap_node *n = NULL;`
`366`	`366`	`u32 mapunit, count, startbit, index, i;`
`@@ -478,7 +478,7 @@ int ebitmap_read(struct ebitmap e, void fp)`
`478`	`478`	`goto out;`
`479`	`479`	`}`
`480`	`480`
`481`		`-int ebitmap_write(const struct ebitmap e, void fp)`
	`481`	`+int ebitmap_write(const struct ebitmap e, struct policy_file fp)`
`482`	`482`	`{`
`483`	`483`	`struct ebitmap_node *n;`
`484`	`484`	`u32 bit, count, last_bit, last_startbit;`