libsemanage/backport-libsemanage-handle-cil_set_handle_unknown-failure.patch
hugel 670213ce64 backport patches from upstream
(cherry picked from commit a6c5156e71001ac8cf1b559ce274e5306006cede)
2025-03-17 17:19:28 +08:00

36 lines
1.1 KiB
Diff

From 419a76e65693affcf89746fe9b9ad20c62e541bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Mon, 25 Nov 2024 12:18:33 +0100
Subject: [PATCH] libsemanage: handle cil_set_handle_unknown() failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Conflict:Context adaptation
Reference:https://github.com/SELinuxProject/selinux/commit/419a76e65693affcf89746fe9b9ad20c62e541bb
---
src/direct_api.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/direct_api.c b/src/direct_api.c
index 85876676..a271a576 100644
--- a/src/direct_api.c
+++ b/src/direct_api.c
@@ -1417,7 +1417,9 @@ rebuild:
cil_set_policy_version(cildb, sh->conf->policyvers);
if (sh->conf->handle_unknown != -1) {
- cil_set_handle_unknown(cildb, sh->conf->handle_unknown);
+ retval = cil_set_handle_unknown(cildb, sh->conf->handle_unknown);
+ if (retval < 0)
+ goto cleanup;
}
retval = semanage_load_files(sh, cildb, mod_filenames, num_modinfos);
--
2.33.0