119 lines
3.3 KiB
Diff
119 lines
3.3 KiB
Diff
From 1d5c3b7204b418710a257b80feaae04527585546 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 19 Dec 2023 17:09:25 +0100
|
|
Subject: [PATCH] libselinux/utils: free allocated resources
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Remove noise while running with sanitizers or under valgrind.
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
|
|
Reference:https://github.com/SELinuxProject/selinux/commit/1d5c3b7204b418710a257b80feaae04527585546
|
|
Conflict:path and context adapt, del selinuxexeccon.c modification
|
|
|
|
---
|
|
utils/getconlist.c | 10 +++++++---
|
|
utils/getdefaultcon.c | 16 +++++++++++++++++---
|
|
2 files changed, 20 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/utils/getconlist.c b/utils/getconlist.c
|
|
index 92f6a793..1ff05209 100644
|
|
--- a/utils/getconlist.c
|
|
+++ b/utils/getconlist.c
|
|
@@ -19,8 +19,9 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *d
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
- char **list, *cur_context = NULL;
|
|
- char *user = NULL, *level = NULL;
|
|
+ char **list;
|
|
+ const char *cur_context, *user;
|
|
+ char *cur_con = NULL, *level = NULL;
|
|
int ret, i, opt;
|
|
|
|
while ((opt = getopt(argc, argv, "l:")) > 0) {
|
|
@@ -54,11 +55,12 @@ int main(int argc, char **argv)
|
|
|
|
/* If a context wasn't passed, use the current context. */
|
|
if (((argc - optind) < 2)) {
|
|
- if (getcon(&cur_context) < 0) {
|
|
+ if (getcon(&cur_con) < 0) {
|
|
fprintf(stderr, "Couldn't get current context.\n");
|
|
free(level);
|
|
return 2;
|
|
}
|
|
+ cur_context = cur_con;
|
|
} else {
|
|
cur_context = argv[optind + 1];
|
|
if (security_check_context(cur_context) != 0) {
|
|
@@ -82,10 +84,12 @@ int main(int argc, char **argv)
|
|
} else {
|
|
fprintf(stderr, "get_ordered_context_list%s failure: %d(%s)\n",
|
|
level ? "_with_level" : "", errno, strerror(errno));
|
|
+ free(cur_con);
|
|
free(level);
|
|
return 4;
|
|
}
|
|
|
|
+ free(cur_con);
|
|
free(level);
|
|
|
|
return 0;
|
|
diff --git a/utils/getdefaultcon.c b/utils/getdefaultcon.c
|
|
index 50f1ea91..67c84f94 100644
|
|
--- a/utils/getdefaultcon.c
|
|
+++ b/utils/getdefaultcon.c
|
|
@@ -19,8 +19,9 @@ static __attribute__ ((__noreturn__)) void usage(const char *name, const char *d
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
- char * usercon = NULL, *cur_context = NULL;
|
|
- char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
|
|
+ const char *cur_context, *user;
|
|
+ char *usercon = NULL, *cur_con = NULL;
|
|
+ char *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
|
|
char *service = NULL;
|
|
int ret, opt;
|
|
int verbose = 0;
|
|
@@ -54,6 +55,9 @@ int main(int argc, char **argv)
|
|
if (!is_selinux_enabled()) {
|
|
fprintf(stderr,
|
|
"%s may be used only on a SELinux kernel.\n", argv[0]);
|
|
+ free(level);
|
|
+ free(role);
|
|
+ free(service);
|
|
return 1;
|
|
}
|
|
|
|
@@ -61,10 +65,14 @@ int main(int argc, char **argv)
|
|
|
|
/* If a context wasn't passed, use the current context. */
|
|
if (((argc - optind) < 2)) {
|
|
- if (getcon(&cur_context) < 0) {
|
|
+ if (getcon(&cur_con) < 0) {
|
|
fprintf(stderr, "Couldn't get current context.\n");
|
|
+ free(level);
|
|
+ free(role);
|
|
+ free(service);
|
|
return 2;
|
|
}
|
|
+ cur_context = cur_con;
|
|
} else
|
|
cur_context = argv[optind + 1];
|
|
|
|
@@ -90,6 +98,8 @@ out:
|
|
if (level != dlevel) free(level);
|
|
free(dlevel);
|
|
free(usercon);
|
|
+ free(cur_con);
|
|
+ free(service);
|
|
|
|
return ret >= 0;
|
|
}
|
|
--
|
|
2.33.0
|
|
|