minit

commit 85d8345b2606a7670d65f133d9fe4e677d8c8b76
parent 5f2a0aacaac07dc98ac1e5f58918946221fcbb44
Author: leitner <leitner>
Date:   Mon, 20 Jul 2020 14:42:43 +0000

fix memory leaks (fount be Giorgio)

Diffstat:
M
Makefile
 | 
5
++++-
M
minit.c
 | 
9
++++++++-

2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -3,7 +3,8 @@ minit-update serdo ftrigger waitinterface waitport powersave # governor
 
 #CFLAGS=-pipe -march=i386 -fomit-frame-pointer -Os -I../dietlibc/include
 CC=gcc
-CFLAGS=-Wall -W -pipe -fomit-frame-pointer -Os
+PIE=
+CFLAGS=-Wall -W -pipe -fomit-frame-pointer -Os $(PIE)
 CROSS=
 #CROSS=arm-linux-
 LDFLAGS=-s
@@ -114,3 +115,5 @@ tar: clean rename
 rename:
 	if test $(CURNAME) != $(VERSION); then cd .. && mv $(CURNAME) $(VERSION); fi
 
+pie:
+	$(MAKE) all PIE=-fpie
diff --git a/minit.c b/minit.c
@@ -261,6 +261,9 @@ again:
       fcntl(1,F_SETFD,0);
       fcntl(2,F_SETFD,0);
     }
+    // openreadclose and split allocate memory.
+    // We leak it here, because we are in the child process that is
+    // about to execve somebody else, at which point the OS frees all.
     if (!openreadclose("nice",&s,&len)) {
       int n=atoi(s);
       nice(n);
@@ -373,8 +376,10 @@ int startservice(int service,int pause,int father) {
     startservice(root[service].logservice,pause,service);
   if (chdir(MINITROOT) || chdir(root[service].name)) return -1;
   if ((dir=open(".",O_RDONLY))>=0) {
+    // openreadclose allocates memory and reads the file contents into it. 
+    // Need to free(s) independent of openreadclose return value
     if (!openreadclose("depends",&s,&len)) {
-      char **deps;
+      char **deps=0;
       int depc,i;
       deps=split(s,'\n',&depc,0,0);
       for (i=0; i<depc; i++) {
@@ -395,7 +400,9 @@ int startservice(int service,int pause,int father) {
 	  startservice(Service,0,service);
       }
       fchdir(dir);
+      free(deps);
     }
+    free(s);
     pid=startnodep(service,pause);
 
 #if 0