[PATCH iproute2] ss: use freecon() instead of free() when appropriate
From: Andrea Claudi <hidden>
Date: 2022-01-28 10:54:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
According to SELinux API, when resources are allocated using getpidcon() of getfilecon(), they should be freed using freecon(). This commit makes ss use freecon() where appropriate, defining a stub function executing a free() useful when iproute2 is compiled without SELinux support. Signed-off-by: Andrea Claudi <redacted> --- misc/ss.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/misc/ss.c b/misc/ss.c
index b39f63fe..f7d36914 100644
--- a/misc/ss.c
+++ b/misc/ss.c@@ -97,6 +97,11 @@ static int security_get_initial_context(char *name, char **context) *context = NULL; return -1; } + +static void freecon(char *context) +{ + free(context); +} #endif int preferred_family = AF_UNSPEC;
@@ -618,7 +623,7 @@ static void user_ent_hash_build(void) snprintf(name + nameoff, sizeof(name) - nameoff, "%d/fd/", pid); pos = strlen(name); if ((dir1 = opendir(name)) == NULL) { - free(pid_context); + freecon(pid_context); continue; }
@@ -667,9 +672,9 @@ static void user_ent_hash_build(void) } user_ent_add(ino, p, pid, fd, pid_context, sock_context); - free(sock_context); + freecon(sock_context); } - free(pid_context); + freecon(pid_context); closedir(dir1); } closedir(dir);
@@ -4725,7 +4730,7 @@ static int netlink_show_one(struct filter *f, getpidcon(pid, &pid_context); out(" proc_ctx=%s", pid_context ? : "unavailable"); - free(pid_context); + freecon(pid_context); } if (show_details) {
--
2.34.1