Compare commits
No commits in common. 'c9' and 'i9c-beta' have entirely different histories.
@ -1,3 +1,3 @@
|
||||
f4fc52c6ec16cec13405d66752c0b222fff893e7 SOURCES/fapolicyd-1.3.2.tar.gz
|
||||
e61573db3de4d229377eebff8252765058ad4ab9 SOURCES/fapolicyd-selinux-0.6.tar.gz
|
||||
0c3e18b68cc92611ed45fe884229351eaebdf170 SOURCES/fapolicyd-1.3.3.tar.gz
|
||||
ec91994fc4257a8d1a76e1c98eeccaf97ef4178f SOURCES/fapolicyd-selinux-0.7.tar.gz
|
||||
fbafa356359ace80787ce6634d84425b40d90907 SOURCES/uthash-2.3.0.tar.gz
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
SOURCES/fapolicyd-1.3.2.tar.gz
|
||||
SOURCES/fapolicyd-selinux-0.6.tar.gz
|
||||
SOURCES/fapolicyd-1.3.3.tar.gz
|
||||
SOURCES/fapolicyd-selinux-0.7.tar.gz
|
||||
SOURCES/uthash-2.3.0.tar.gz
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From 248219377a034d7da9238e7424c97558395700e3 Mon Sep 17 00:00:00 2001
|
||||
From: Radovan Sroka <rsroka@redhat.com>
|
||||
Date: Tue, 18 Jul 2023 17:05:11 +0200
|
||||
Subject: [PATCH] Fix multiple leaks
|
||||
|
||||
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
|
||||
---
|
||||
src/library/filter.c | 3 +++
|
||||
src/library/policy.c | 13 +++++++++++--
|
||||
src/library/rules.c | 3 ---
|
||||
3 files changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/library/filter.c b/src/library/filter.c
|
||||
index d5d8cca..eb378ca 100644
|
||||
--- a/src/library/filter.c
|
||||
+++ b/src/library/filter.c
|
||||
@@ -472,9 +472,12 @@ int filter_load_file(void)
|
||||
msg(LOG_ERR, "filter_load_file: paring error line: %ld, \"%s\"", line_number, line);
|
||||
filter_destroy_obj(filter);
|
||||
free(line);
|
||||
+ line = NULL;
|
||||
goto bad;
|
||||
}
|
||||
+ }
|
||||
|
||||
+ if (line) {
|
||||
free(line);
|
||||
line = NULL;
|
||||
}
|
||||
diff --git a/src/library/policy.c b/src/library/policy.c
|
||||
index 7fe1210..31ff6e2 100644
|
||||
--- a/src/library/policy.c
|
||||
+++ b/src/library/policy.c
|
||||
@@ -23,6 +23,7 @@
|
||||
* Radovan Sroka <rsroka@redhat.com>
|
||||
*/
|
||||
|
||||
+#include "attr-sets.h"
|
||||
#include "config.h"
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
@@ -273,12 +274,20 @@ int load_rules(const conf_t *_config)
|
||||
return 1;
|
||||
|
||||
FILE * f = open_file();
|
||||
- if (f == NULL)
|
||||
+ if (f == NULL) {
|
||||
+ destroy_attr_sets();
|
||||
return 1;
|
||||
+ }
|
||||
|
||||
int res = _load_rules(_config, f);
|
||||
fclose(f);
|
||||
- return res;
|
||||
+
|
||||
+ if (res) {
|
||||
+ destroy_attr_sets();
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
void destroy_rules(void)
|
||||
diff --git a/src/library/rules.c b/src/library/rules.c
|
||||
index 5ffa40e..4a8b098 100644
|
||||
--- a/src/library/rules.c
|
||||
+++ b/src/library/rules.c
|
||||
@@ -65,9 +65,6 @@ int rules_create(llist *l)
|
||||
l->cur = NULL;
|
||||
l->cnt = 0;
|
||||
|
||||
- if (init_attr_sets())
|
||||
- return 1;
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
From 05780f9accae504440ffed0548bd3e4144cfb70e Mon Sep 17 00:00:00 2001
|
||||
From: Radovan Sroka <rsroka@redhat.com>
|
||||
Date: Wed, 19 Jul 2023 16:00:13 +0200
|
||||
Subject: [PATCH] Allow links
|
||||
|
||||
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
|
||||
---
|
||||
fapolicyd.te | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/fapolicyd-selinux-0.6/fapolicyd.te b/fapolicyd-selinux-0.6/fapolicyd.te
|
||||
index daf31bd..5d6f9aa 100644
|
||||
--- a/fapolicyd-selinux-0.6/fapolicyd.te
|
||||
+++ b/fapolicyd-selinux-0.6/fapolicyd.te
|
||||
@@ -53,6 +53,8 @@ ifdef(`fs_watch_all_fs',`
|
||||
files_watch_sb_all_mountpoints(fapolicyd_t)
|
||||
')
|
||||
|
||||
+allow fapolicyd_t file_type : lnk_file { getattr read };
|
||||
+
|
||||
manage_files_pattern(fapolicyd_t, fapolicyd_log_t, fapolicyd_log_t)
|
||||
logging_log_filetrans(fapolicyd_t, fapolicyd_log_t, file)
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 750c5e288f8253c71a9722da960addb078aee93c Mon Sep 17 00:00:00 2001
|
||||
From: Zdenek Pytela <zpytela@redhat.com>
|
||||
Date: Tue, 6 Feb 2024 21:17:27 +0100
|
||||
Subject: [PATCH] Rename all /var/run file context entries to /run
|
||||
|
||||
With the 1f76e522a ("Rename all /var/run file context entries to /run")
|
||||
selinux-policy commit, all /var/run file context entries moved to /run
|
||||
and the equivalency was inverted. Subsequently, changes in fapolicyd.fc
|
||||
need to be done, too, in a similar manner.
|
||||
---
|
||||
fapolicyd.fc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/fapolicyd-selinux-0.7/fapolicyd.fc b/fapolicyd-selinux-0.7/fapolicyd.fc
|
||||
index 2bdc7aa..d081dc8 100644
|
||||
--- a/fapolicyd-selinux-0.7/fapolicyd.fc
|
||||
+++ b/fapolicyd-selinux-0.7/fapolicyd.fc
|
||||
@@ -8,6 +8,6 @@
|
||||
|
||||
/var/log/fapolicyd-access.log -- gen_context(system_u:object_r:fapolicyd_log_t,s0)
|
||||
|
||||
-/var/run/fapolicyd(/.*)? gen_context(system_u:object_r:fapolicyd_var_run_t,s0)
|
||||
+/run/fapolicyd(/.*)? gen_context(system_u:object_r:fapolicyd_var_run_t,s0)
|
||||
|
||||
-/var/run/fapolicyd\.pid -- gen_context(system_u:object_r:fapolicyd_var_run_t,s0)
|
||||
+/run/fapolicyd\.pid -- gen_context(system_u:object_r:fapolicyd_var_run_t,s0)
|
||||
Loading…
Reference in new issue