POTD skeleton #58.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 11 insertions, 7 deletions

diff --git a/src/utils.c b/src/utils.c
index 945f8a5..ae036de 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -50,6 +50,9 @@ static void sighandler_child(int signo)
                 exit(EXIT_SUCCESS);
             }
             break;
+        case SIGSEGV:
+            E("%s", "Got a SIGSEGV signal, abort ..");
+            exit(EXIT_FAILURE);
     }
 }
 
@@ -59,6 +62,7 @@ int set_child_sighandler(void)
         return 1;
     assert( signal(SIGCHLD, SIG_IGN) != SIG_ERR );
     assert( signal(SIGPIPE, SIG_IGN) != SIG_ERR );
+    assert( signal(SIGSEGV, sighandler_child) != SIG_ERR );
 
     return signal(SIGHUP, sighandler_child) == SIG_ERR;
 }
@@ -282,7 +286,7 @@ void chk_chroot(void)
             return;
     }
 
-    E("%s", "Can not mount filesystem as slave");
+    E("%s", "Can not mount filesystem as private");
     exit(EXIT_FAILURE);
 }
 
@@ -361,7 +365,7 @@ int create_device_file_checked(const char *mount_path, const char *device_file,
         return 1;
     }
     if (errno == EEXIST) {
-        if (remove(devpath))
+        if (unlink(devpath))
             return 1;
     }
 
@@ -391,8 +395,8 @@ int update_guid_map(pid_t pid, unsigned int map[3], int update_uidmap)
 {
     int s, fd;
     ssize_t written;
-    const char *const path_pid = "/proc/%d/%s";
-    const char *const path_self = "/proc/self/%s";
+    const char path_pid[] = "/proc/%d/%s";
+    const char path_self[] = "/proc/self/%s";
     char buf[64];
 
     if (pid < 0) {
@@ -421,9 +425,9 @@ int update_setgroups_self(int allow)
 {
     int fd;
     ssize_t written;
-    const char *const path_self = "/proc/self/setgroups";
-    const char *const str_allow = "allow";
-    const char *const str_deny = "deny";
+    const char path_self[] = "/proc/self/setgroups";
+    const char str_allow[] = "allow";
+    const char str_deny[] = "deny";
 
     fd = open(path_self, O_WRONLY);
     if (fd < 0)