MAC: Rename mac_cred_create_swapper to mac_cred_create_kproc0

bsdjhb · bsdjhb · commit 61ffc1bf8c42 · 2025-12-04T14:52:59.000-05:00
Reported by: markj Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D54052
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
@@ -560,7 +560,7 @@ proc0_init(void *dummy __unused)
 	audit_cred_kproc0(newcred);
 #endif
 #ifdef MAC
-	mac_cred_create_swapper(newcred);
+	mac_cred_create_kproc0(newcred);
 #endif
 	/* Create sigacts. */
 	p->p_sigacts = sigacts_alloc();
diff --git a/sys/security/mac/mac_cred.c b/sys/security/mac/mac_cred.c
@@ -132,10 +132,10 @@ mac_cred_associate_nfsd(struct ucred *cred)
  * processes and threads are spawned.
  */
 void
-mac_cred_create_swapper(struct ucred *cred)
+mac_cred_create_kproc0(struct ucred *cred)
 {
 
-	MAC_POLICY_PERFORM_NOSLEEP(cred_create_swapper, cred);
+	MAC_POLICY_PERFORM_NOSLEEP(cred_create_kproc0, cred);
 }
 
 /*
diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h
@@ -134,7 +134,7 @@ int	mac_cred_check_setuid(struct ucred *cred, uid_t uid);
 int	mac_cred_check_visible(struct ucred *cr1, struct ucred *cr2);
 void	mac_cred_copy(struct ucred *cr1, struct ucred *cr2);
 void	mac_cred_create_init(struct ucred *cred);
-void	mac_cred_create_swapper(struct ucred *cred);
+void	mac_cred_create_kproc0(struct ucred *cred);
 void	mac_cred_destroy(struct ucred *);
 void	mac_cred_init(struct ucred *);
 
diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h
@@ -167,7 +167,7 @@ typedef int	(*mpo_cred_check_visible_t)(struct ucred *cr1,
 typedef void	(*mpo_cred_copy_label_t)(struct label *src,
 		    struct label *dest);
 typedef void	(*mpo_cred_create_init_t)(struct ucred *cred);
-typedef void	(*mpo_cred_create_swapper_t)(struct ucred *cred);
+typedef void	(*mpo_cred_create_kproc0_t)(struct ucred *cred);
 typedef void	(*mpo_cred_destroy_label_t)(struct label *label);
 typedef int	(*mpo_cred_externalize_label_t)(struct label *label,
 		    char *element_name, struct sbuf *sb, int *claimed);
@@ -738,7 +738,7 @@ struct mac_policy_ops {
 	mpo_cred_check_setresgid_t		mpo_cred_check_setresgid;
 	mpo_cred_check_visible_t		mpo_cred_check_visible;
 	mpo_cred_copy_label_t			mpo_cred_copy_label;
-	mpo_cred_create_swapper_t		mpo_cred_create_swapper;
+	mpo_cred_create_kproc0_t		mpo_cred_create_kproc0;
 	mpo_cred_create_init_t			mpo_cred_create_init;
 	mpo_cred_destroy_label_t		mpo_cred_destroy_label;
 	mpo_cred_externalize_label_t		mpo_cred_externalize_label;
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
@@ -912,7 +912,7 @@ biba_cred_create_init(struct ucred *cred)
 }
 
 static void
-biba_cred_create_swapper(struct ucred *cred)
+biba_cred_create_kproc0(struct ucred *cred)
 {
 	struct mac_biba *dest;
 
@@ -3574,7 +3574,7 @@ static struct mac_policy_ops mac_biba_ops =
 	.mpo_cred_check_visible = biba_cred_check_visible,
 	.mpo_cred_copy_label = biba_copy_label,
 	.mpo_cred_create_init = biba_cred_create_init,
-	.mpo_cred_create_swapper = biba_cred_create_swapper,
+	.mpo_cred_create_kproc0 = biba_cred_create_kproc0,
 	.mpo_cred_destroy_label = biba_destroy_label,
 	.mpo_cred_externalize_label = biba_externalize_label,
 	.mpo_cred_init_label = biba_init_label,
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
@@ -1008,7 +1008,7 @@ lomac_cred_create_init(struct ucred *cred)
 }
 
 static void
-lomac_cred_create_swapper(struct ucred *cred)
+lomac_cred_create_kproc0(struct ucred *cred)
 {
 	struct mac_lomac *dest;
 
@@ -2910,7 +2910,7 @@ static struct mac_policy_ops lomac_ops =
 	.mpo_cred_check_relabel = lomac_cred_check_relabel,
 	.mpo_cred_check_visible = lomac_cred_check_visible,
 	.mpo_cred_copy_label = lomac_copy_label,
-	.mpo_cred_create_swapper = lomac_cred_create_swapper,
+	.mpo_cred_create_kproc0 = lomac_cred_create_kproc0,
 	.mpo_cred_create_init = lomac_cred_create_init,
 	.mpo_cred_destroy_label = lomac_destroy_label,
 	.mpo_cred_externalize_label = lomac_externalize_label,
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
@@ -875,7 +875,7 @@ mls_cred_create_init(struct ucred *cred)
 }
 
 static void
-mls_cred_create_swapper(struct ucred *cred)
+mls_cred_create_kproc0(struct ucred *cred)
 {
 	struct mac_mls *dest;
 
@@ -3203,7 +3203,7 @@ static struct mac_policy_ops mls_ops =
 	.mpo_cred_check_visible = mls_cred_check_visible,
 	.mpo_cred_copy_label = mls_copy_label,
 	.mpo_cred_create_init = mls_cred_create_init,
-	.mpo_cred_create_swapper = mls_cred_create_swapper,
+	.mpo_cred_create_kproc0 = mls_cred_create_kproc0,
 	.mpo_cred_destroy_label = mls_destroy_label,
 	.mpo_cred_externalize_label = mls_externalize_label,
 	.mpo_cred_init_label = mls_init_label,
diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c
@@ -159,7 +159,7 @@ partition_cred_create_init(struct ucred *cred)
 }
 
 static void
-partition_cred_create_swapper(struct ucred *cred)
+partition_cred_create_kproc0(struct ucred *cred)
 {
 
 	SLOT_SET(cred->cr_label, 0);
@@ -298,7 +298,7 @@ static struct mac_policy_ops partition_ops =
 	.mpo_cred_check_visible = partition_cred_check_visible,
 	.mpo_cred_copy_label = partition_cred_copy_label,
 	.mpo_cred_create_init = partition_cred_create_init,
-	.mpo_cred_create_swapper = partition_cred_create_swapper,
+	.mpo_cred_create_kproc0 = partition_cred_create_kproc0,
 	.mpo_cred_destroy_label = partition_cred_destroy_label,
 	.mpo_cred_externalize_label = partition_cred_externalize_label,
 	.mpo_cred_init_label = partition_cred_init_label,
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
@@ -319,7 +319,7 @@ stub_cred_create_init(struct ucred *cred)
 }
 
 static void
-stub_cred_create_swapper(struct ucred *cred)
+stub_cred_create_kproc0(struct ucred *cred)
 {
 
 }
@@ -1720,7 +1720,7 @@ static struct mac_policy_ops stub_ops =
 	.mpo_cred_check_visible = stub_cred_check_visible,
 	.mpo_cred_copy_label = stub_copy_label,
 	.mpo_cred_create_init = stub_cred_create_init,
-	.mpo_cred_create_swapper = stub_cred_create_swapper,
+	.mpo_cred_create_kproc0 = stub_cred_create_kproc0,
 	.mpo_cred_destroy_label = stub_destroy_label,
 	.mpo_cred_externalize_label = stub_externalize_label,
 	.mpo_cred_init_label = stub_init_label,
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
@@ -416,13 +416,13 @@ test_cred_create_init(struct ucred *cred)
 	COUNTER_INC(cred_create_init);
 }
 
-COUNTER_DECL(cred_create_swapper);
+COUNTER_DECL(cred_create_kproc0);
 static void
-test_cred_create_swapper(struct ucred *cred)
+test_cred_create_kproc0(struct ucred *cred)
 {
 
 	LABEL_CHECK(cred->cr_label, MAGIC_CRED);
-	COUNTER_INC(cred_create_swapper);
+	COUNTER_INC(cred_create_kproc0);
 }
 
 COUNTER_DECL(cred_destroy_label);
@@ -3074,7 +3074,7 @@ static struct mac_policy_ops test_ops =
 	.mpo_cred_check_visible = test_cred_check_visible,
 	.mpo_cred_copy_label = test_cred_copy_label,
 	.mpo_cred_create_init = test_cred_create_init,
-	.mpo_cred_create_swapper = test_cred_create_swapper,
+	.mpo_cred_create_kproc0 = test_cred_create_kproc0,
 	.mpo_cred_destroy_label = test_cred_destroy_label,
 	.mpo_cred_externalize_label = test_cred_externalize_label,
 	.mpo_cred_init_label = test_cred_init_label,

Original file line number	Diff line number	Diff line change
`@@ -132,10 +132,10 @@ mac_cred_associate_nfsd(struct ucred *cred)`
`132`	`132`	`* processes and threads are spawned.`
`133`	`133`	`*/`
`134`	`134`	`void`
`135`		`-mac_cred_create_swapper(struct ucred *cred)`
	`135`	`+mac_cred_create_kproc0(struct ucred *cred)`
`136`	`136`	`{`
`137`	`137`
`138`		`- MAC_POLICY_PERFORM_NOSLEEP(cred_create_swapper, cred);`
	`138`	`+ MAC_POLICY_PERFORM_NOSLEEP(cred_create_kproc0, cred);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ stub_cred_create_init(struct ucred *cred)`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`static void`
`322`		`-stub_cred_create_swapper(struct ucred *cred)`
	`322`	`+stub_cred_create_kproc0(struct ucred *cred)`
`323`	`323`	`{`
`324`	`324`
`325`	`325`	`}`
`@@ -1720,7 +1720,7 @@ static struct mac_policy_ops stub_ops =`
`1720`	`1720`	`.mpo_cred_check_visible = stub_cred_check_visible,`
`1721`	`1721`	`.mpo_cred_copy_label = stub_copy_label,`
`1722`	`1722`	`.mpo_cred_create_init = stub_cred_create_init,`
`1723`		`- .mpo_cred_create_swapper = stub_cred_create_swapper,`
	`1723`	`+ .mpo_cred_create_kproc0 = stub_cred_create_kproc0,`
`1724`	`1724`	`.mpo_cred_destroy_label = stub_destroy_label,`
`1725`	`1725`	`.mpo_cred_externalize_label = stub_externalize_label,`
`1726`	`1726`	`.mpo_cred_init_label = stub_init_label,`