Page MenuHomeFreeBSD
Files F139814828

D53954-fixes.patch
olce (Olivier Certner)
Actions

Authored By
olce
Tue, Dec 16, 2:32 PM
Size
2 KB
Referenced Files
None
Subscribers
None

D53954-fixes.patch
View Options

diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index b643c5fd4467..b421db0485bb 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.c
@@ -1910,11 +1910,10 @@ static struct mac_policy_ops stub_ops =
.mpo_posixshm_destroy_label = stub_destroy_label,
.mpo_posixshm_init_label = stub_init_label,
.mpo_prison_init_label = stub_init_label_waitcheck,
.mpo_prison_destroy_label = stub_destroy_label,
- .mpo_prison_copy_label = stub_copy_label,
.mpo_prison_externalize_label = stub_externalize_label,
.mpo_prison_internalize_label = stub_internalize_label,
.mpo_prison_relabel = stub_prison_relabel,
.mpo_prison_check_relabel = stub_prison_check_relabel,
.mpo_prison_check_attach = stub_prison_check_attach,
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
index 0d2647bf8c7d..a43db44e4960 100644
--- a/sys/security/mac_test/mac_test.c
+++ b/sys/security/mac_test/mac_test.c
@@ -1615,20 +1615,10 @@ test_prison_destroy_label(struct label *label)
LABEL_DESTROY(label, MAGIC_PRISON);
COUNTER_INC(prison_destroy_label);
}
-COUNTER_DECL(prison_copy_label);
-static void
-test_prison_copy_label(struct label *src, struct label *dest)
-{
-
- LABEL_CHECK(src, MAGIC_PRISON);
- LABEL_CHECK(dest, MAGIC_PRISON);
- COUNTER_INC(prison_copy_label);
-}
-
COUNTER_DECL(prison_externalize_label);
static int
test_prison_externalize_label(struct label *label, char *element_name,
struct sbuf *sb, int *claimed)
{
@@ -3365,11 +3355,10 @@ static struct mac_policy_ops test_ops =
.mpo_posixshm_destroy_label = test_posixshm_destroy_label,
.mpo_posixshm_init_label = test_posixshm_init_label,
.mpo_prison_init_label = test_prison_init_label,
.mpo_prison_destroy_label = test_prison_destroy_label,
- .mpo_prison_copy_label = test_prison_copy_label,
.mpo_prison_externalize_label = test_prison_externalize_label,
.mpo_prison_internalize_label = test_prison_internalize_label,
.mpo_prison_relabel = test_prison_relabel,
.mpo_prison_check_relabel = test_prison_check_relabel,
.mpo_prison_check_attach = test_prison_check_attach,

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27032569
Default Alt Text
D53954-fixes.patch (2 KB)

Event Timeline