diff options
Diffstat (limited to '0002-libsemanage-fix-kernel-pathname-in-semanage_verify_k.patch')
| -rw-r--r-- | 0002-libsemanage-fix-kernel-pathname-in-semanage_verify_k.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/0002-libsemanage-fix-kernel-pathname-in-semanage_verify_k.patch b/0002-libsemanage-fix-kernel-pathname-in-semanage_verify_k.patch deleted file mode 100644 index 89fc8430c8c4..000000000000 --- a/0002-libsemanage-fix-kernel-pathname-in-semanage_verify_k.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e59d72d312fcee86571b93f3ca61a963379c8ade Mon Sep 17 00:00:00 2001 -From: Stephen Smalley <sds@tycho.nsa.gov> -Date: Wed, 2 Nov 2016 08:54:19 -0400 -Subject: [PATCH] libsemanage: fix kernel pathname in semanage_verify_kernel() - -Building with CC=clang, we get the following errors: - -semanage_store.c:2177:20: error: implicit conversion from enumeration type 'enum semanage_final_defs' to different enumeration type 'enum semanage_store_defs' [-Werror,-Wenum-conversion] - semanage_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL); - ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~ -semanage_store.c:2177:40: error: implicit conversion from enumeration type 'enum semanage_final_path_defs' to different enumeration type 'enum semanage_sandbox_defs' [-Werror,-Wenum-conversion] - semanage_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL); - ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~ - -This is an actual bug; semanage_verify_kernel() was never updated to -use semanage_final_path() when the rest were converted. Fix it. -This pathname is only used if a kernel policy verifier is specified -in semanage.conf, so this is not used by default. - -Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> ---- - libsemanage/src/semanage_store.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libsemanage/src/semanage_store.c b/libsemanage/src/semanage_store.c -index ca2925774630..58a58ef9452e 100644 ---- a/libsemanage/src/semanage_store.c -+++ b/libsemanage/src/semanage_store.c -@@ -2174,7 +2174,7 @@ int semanage_verify_kernel(semanage_handle_t * sh) - { - int retval = -1; - const char *kernel_filename = -- semanage_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL); -+ semanage_final_path(SEMANAGE_FINAL_TMP, SEMANAGE_KERNEL); - semanage_conf_t *conf = sh->conf; - external_prog_t *e; - if (conf->kernel_prog == NULL) { --- -2.10.2 - |