c59879b8aa
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libsepol-3.2..32611aea6543 -- libsepol
59 lines
1.6 KiB
Diff
59 lines
1.6 KiB
Diff
From 859857def94bd6c8ad9e9ecce88c85d19dc19933 Mon Sep 17 00:00:00 2001
|
|
From: James Carter <jwcart2@gmail.com>
|
|
Date: Thu, 11 Mar 2021 11:56:44 -0500
|
|
Subject: [PATCH] libsepol: Remove unnecessary copying of declarations from
|
|
link.c
|
|
|
|
At one point link_modules() might have needed this initial copying,
|
|
but now it serves no purpose, so remove it.
|
|
|
|
Signed-off-by: James Carter <jwcart2@gmail.com>
|
|
---
|
|
libsepol/src/link.c | 30 ------------------------------
|
|
1 file changed, 30 deletions(-)
|
|
|
|
diff --git a/libsepol/src/link.c b/libsepol/src/link.c
|
|
index 83bbc8a5c7d1..bdc1fcbf59d3 100644
|
|
--- a/libsepol/src/link.c
|
|
+++ b/libsepol/src/link.c
|
|
@@ -2573,36 +2573,6 @@ int link_modules(sepol_handle_t * handle,
|
|
goto cleanup;
|
|
}
|
|
|
|
- /* copy all types, declared and required */
|
|
- for (i = 0; i < len; i++) {
|
|
- state.cur = modules[i];
|
|
- state.cur_mod_name = modules[i]->policy->name;
|
|
- ret =
|
|
- hashtab_map(modules[i]->policy->p_types.table,
|
|
- type_copy_callback, &state);
|
|
- if (ret) {
|
|
- retval = ret;
|
|
- goto cleanup;
|
|
- }
|
|
- }
|
|
-
|
|
- /* then copy everything else, including aliases, and fixup attributes */
|
|
- for (i = 0; i < len; i++) {
|
|
- state.cur = modules[i];
|
|
- state.cur_mod_name = modules[i]->policy->name;
|
|
- ret =
|
|
- copy_identifiers(&state, modules[i]->policy->symtab, NULL);
|
|
- if (ret) {
|
|
- retval = ret;
|
|
- goto cleanup;
|
|
- }
|
|
- }
|
|
-
|
|
- if (policydb_index_others(state.handle, state.base, 0)) {
|
|
- ERR(state.handle, "Error while indexing others");
|
|
- goto cleanup;
|
|
- }
|
|
-
|
|
/* copy and remap the module's data over to base */
|
|
for (i = 0; i < len; i++) {
|
|
state.cur = modules[i];
|
|
--
|
|
2.32.0
|
|
|