From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 12 Jan 2023 12:27:58 +0000 (+0000)
Subject: cgroups: Make killall function static and fix memory leak
X-Git-Tag: 0.9.29~395
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=689aa7de9febfebd972b957bc4c1a46d551d47f5;p=pakfire.git

cgroups: Make killall function static and fix memory leak

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/cgroup.c b/src/libpakfire/cgroup.c
index 12ba51859..cc6cce94c 100644
--- a/src/libpakfire/cgroup.c
+++ b/src/libpakfire/cgroup.c
@@ -580,7 +580,10 @@ static int pakfire_cgroup_procs_callback(struct pakfire_cgroup* cgroup,
 	}
 
 	// Cleanup
-	fclose(f);
+	if (line)
+		free(line);
+	if (f)
+		fclose(f);
 
 	return r;
 }
@@ -600,7 +603,7 @@ static int send_sigkill(struct pakfire_cgroup* cgroup, const pid_t pid, void* da
 /*
 	Immediately kills all processes in this cgroup
 */
-int pakfire_cgroup_killall(struct pakfire_cgroup* cgroup) {
+static int pakfire_cgroup_killall(struct pakfire_cgroup* cgroup) {
 	DEBUG(cgroup->pakfire, "%s: Killing all processes\n", pakfire_cgroup_name(cgroup));
 
 	// Do we have support for cgroup.kill?
diff --git a/src/libpakfire/include/pakfire/cgroup.h b/src/libpakfire/include/pakfire/cgroup.h
index 716809f08..37a4fdf67 100644
--- a/src/libpakfire/include/pakfire/cgroup.h
+++ b/src/libpakfire/include/pakfire/cgroup.h
@@ -193,7 +193,6 @@ struct pakfire_cgroup* pakfire_cgroup_unref(struct pakfire_cgroup* cgroup);
 int pakfire_cgroup_child(struct pakfire_cgroup** child,
 	struct pakfire_cgroup* cgroup, const char* name, int flags);
 
-int pakfire_cgroup_killall(struct pakfire_cgroup* cgroup);
 int pakfire_cgroup_destroy(struct pakfire_cgroup* cgroup);
 
 int pakfire_cgroup_fd(struct pakfire_cgroup* cgroup);