Merge pull request #356 from giuseppe/error-wrap

error: introduce crun_error_wrap and start using it

Author: rhatdan

src/libcrun/container.c

@@ -598,6 +598,7 @@ container_init_setup (void *args, const char *notify_socket,
       console_socketpair = entrypoint_args->terminal_socketpair[1];
     }
 
+  /* sync 1.  */
   ret = sync_socket_wait_sync (NULL, sync_socket, false, err);
   if (UNLIKELY (ret < 0))
     return ret;
@@ -614,10 +615,12 @@ container_init_setup (void *args, const char *notify_socket,
   if (UNLIKELY (ret < 0))
     return ret;
 
+  /* sync 2.  */
   ret = sync_socket_send_sync (sync_socket, false, err);
   if (UNLIKELY (ret < 0))
     return ret;
 
+  /* sync 3.  */
   ret = sync_socket_wait_sync (NULL, sync_socket, false, err);
   if (UNLIKELY (ret < 0))
     return ret;
@@ -830,6 +833,7 @@ container_init (void *args, const char *notify_socket, int sync_socket,
   if (UNLIKELY (ret < 0))
     return ret;
 
+  /* sync 4.  */
   ret = sync_socket_send_sync (sync_socket, false, err);
   if (UNLIKELY (ret < 0))
     return ret;
@@ -1280,21 +1284,21 @@ wait_for_process (pid_t pid, libcrun_context_t *context, int terminal_fd, int no
             {
               ret = copy_from_fd_to_fd (0, terminal_fd, 0, err);
               if (UNLIKELY (ret < 0))
-                return ret;
+                return crun_error_wrap (err, "copy to terminal fd");
             }
           else if (events[i].data.fd == terminal_fd)
             {
               ret = set_blocking_fd (terminal_fd, 0, err);
               if (UNLIKELY (ret < 0))
-                return ret;
+                return crun_error_wrap (err, "set terminal fd not blocking");
 
               ret = copy_from_fd_to_fd (terminal_fd, 1, 1, err);
               if (UNLIKELY (ret < 0))
-                return ret;
+                return crun_error_wrap (err, "copy from terminal fd");
 
               ret = set_blocking_fd (terminal_fd, 1, err);
               if (UNLIKELY (ret < 0))
-                return ret;
+                return crun_error_wrap (err, "set terminal fd blocking");
             }
           else if (events[i].data.fd == notify_socket)
             {
@@ -1545,7 +1549,8 @@ libcrun_container_run_internal (libcrun_container_t *container, libcrun_context_
       container_args.has_terminal_socket_pair = 1;
       ret = create_socket_pair (container_args.terminal_socketpair, err);
       if (UNLIKELY (ret < 0))
-        return ret;
+        return crun_error_wrap (err, "create terminal socket");
+
       socket_pair_0 = container_args.terminal_socketpair[0];
       socket_pair_1 = container_args.terminal_socketpair[1];
     }
@@ -1566,7 +1571,7 @@ libcrun_container_run_internal (libcrun_container_t *container, libcrun_context_
     {
       console_socket_fd = open_unix_domain_client_socket (context->console_socket, 0, err);
       if (UNLIKELY (console_socket_fd < 0))
-        return console_socket_fd;
+        return crun_error_wrap (err, "open console socket");
       container_args.console_socket_fd = console_socket_fd;
     }
 
@@ -1637,31 +1642,15 @@ libcrun_container_run_internal (libcrun_container_t *container, libcrun_context_
       }
   }
 
-  if (seccomp_fd >= 0)
-    {
-       unsigned int seccomp_gen_options = 0;
-       const char *annotation;
-
-       annotation = find_annotation (container, "run.oci.seccomp_fail_unknown_syscall");
-       if (annotation && strcmp (annotation, "0") != 0)
-         seccomp_gen_options = LIBCRUN_SECCOMP_FAIL_UNKNOWN_SYSCALL;
-
-       ret = libcrun_generate_seccomp (container, seccomp_fd, seccomp_gen_options, err);
-      if (UNLIKELY (ret < 0))
-        {
-          cleanup_watch (context, pid, def, context->id, sync_socket, terminal_fd);
-          return ret;
-        }
-      close_and_reset (&seccomp_fd);
-    }
-
+  /* sync 1.  */
   ret = sync_socket_send_sync (sync_socket, true, err);
   if (UNLIKELY (ret < 0))
     {
       cleanup_watch (context, pid, def, context->id, sync_socket, terminal_fd);
       return ret;
     }
 
+  /* sync 2.  */
   ret = sync_socket_wait_sync (context, sync_socket, false, err);
   if (UNLIKELY (ret < 0))
     {
@@ -1694,14 +1683,26 @@ libcrun_container_run_internal (libcrun_container_t *container, libcrun_context_
         }
     }
 
-  ret = sync_socket_send_sync (sync_socket, true, err);
-  if (UNLIKELY (ret < 0))
+  if (seccomp_fd >= 0)
     {
-      cleanup_watch (context, pid, def, context->id, sync_socket, terminal_fd);
-      return ret;
+      unsigned int seccomp_gen_options = 0;
+      const char *annotation;
+
+      annotation = find_annotation (container, "run.oci.seccomp_fail_unknown_syscall");
+      if (annotation && strcmp (annotation, "0") != 0)
+        seccomp_gen_options = LIBCRUN_SECCOMP_FAIL_UNKNOWN_SYSCALL;
+
+      ret = libcrun_generate_seccomp (container, seccomp_fd, seccomp_gen_options, err);
+      if (UNLIKELY (ret < 0))
+        {
+          cleanup_watch (context, pid, def, context->id, sync_socket, terminal_fd);
+          return ret;
+        }
+      close_and_reset (&seccomp_fd);
     }
 
-  ret = sync_socket_wait_sync (context, sync_socket, false, err);
+  /* sync 3.  */
+  ret = sync_socket_send_sync (sync_socket, true, err);
   if (UNLIKELY (ret < 0))
     {
       cleanup_watch (context, pid, def, context->id, sync_socket, terminal_fd);
@@ -1727,6 +1728,14 @@ libcrun_container_run_internal (libcrun_container_t *container, libcrun_context_
         }
     }
 
+  /* sync 4.  */
+  ret = sync_socket_wait_sync (context, sync_socket, false, err);
+  if (UNLIKELY (ret < 0))
+    {
+      cleanup_watch (context, pid, def, context->id, sync_socket, terminal_fd);
+      return ret;
+    }
+
   ret = close_and_reset (&sync_socket);
   if (UNLIKELY (ret < 0))
     {

src/libcrun/error.c

@@ -61,6 +61,36 @@ crun_make_error (libcrun_error_t *err, int status, const char *msg, ...)
   return -status - 1;
 }
 
+int
+crun_error_wrap (libcrun_error_t *err, const char *fmt, ...)
+{
+  cleanup_free char *msg = NULL;
+  cleanup_free char *tmp = NULL;
+  va_list args_list;
+  char *swap;
+  int ret;
+
+  if (err == NULL || *err == NULL)
+    return 0;
+
+  ret = -(*err)->status -1;
+
+  va_start (args_list, fmt);
+
+  if (vasprintf (&msg, fmt, args_list) < 0)
+    return ret;
+
+  asprintf (&tmp, "%s: %s", msg, (*err)->msg);
+  if (tmp == NULL)
+    return ret;
+
+  swap = tmp;
+  tmp = (*err)->msg;
+  (*err)->msg = swap;
+
+  return ret;
+}
+
 int
 crun_error_release (libcrun_error_t *err)
 {

src/libcrun/error.h

@@ -63,6 +63,8 @@ void log_write_to_stderr (int errno_, const char *msg, bool warning, void *arg);
 
 int crun_make_error (libcrun_error_t *err, int status, const char *msg, ...);
 
+int crun_error_wrap (libcrun_error_t *err, const char *fmt, ...);
+
 int crun_error_get_errno (libcrun_error_t *err);
 
 int crun_error_release (libcrun_error_t *err);