Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cbda6b6 authored by James Morris's avatar James Morris Committed by David S. Miller
Browse files

Rename class_destroy to avoid namespace conflicts. 



We're seeing increasing namespace conflicts between the global
class_destroy() function declared in linux/device.h, and the private
function in the SELinux core code.  This patch renames the SELinux
function to cls_destroy() to avoid this conflict.

Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 484b3669

security/selinux/ss/policydb.c

+3 −3
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int common_destroy(void *key, void *datum, void *p) 
	return 0;

}



static int class_destroy(void *key, void *datum, void *p)

static int cls_destroy(void *key, void *datum, void *p)

{

	struct class_datum *cladatum;

	struct constraint_node *constraint, *ctemp;
@@ -566,7 +566,7 @@ static int cat_destroy(void *key, void *datum, void *p) 
static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) =

{

	common_destroy,

	class_destroy,

	cls_destroy,

	role_destroy,

	type_destroy,

	user_destroy,
@@ -1124,7 +1124,7 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) 
out:

	return rc;

bad:

	class_destroy(key, cladatum, NULL);

	cls_destroy(key, cladatum, NULL);

	goto out;

}