Merge pull request #527 from giuseppe/seccomp-notify-ignore-enoent

seccomp: ignore ENOENT
containers · Nov 2, 2020 · b94b9f6 · b94b9f6
2 parents 55e2a36 + b9172d0
commit b94b9f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
@@ -1420,6 +1420,10 @@ wait_for_process (pid_t pid, libcrun_context_t *context, int terminal_fd, int no
       conf.bundle_path = context->bundle;
       conf.oci_config_path = oci_config_path;
 
+      ret = set_blocking_fd (seccomp_notify_fd, 0, err);
+      if (UNLIKELY (ret < 0))
+        return ret;
+
       ret = libcrun_load_seccomp_notify_plugins (&seccomp_notify_ctx, seccomp_notify_plugins, &conf, err);
       if (UNLIKELY (ret < 0))
         return ret;

diff --git a/src/libcrun/seccomp_notify.c b/src/libcrun/seccomp_notify.c
@@ -165,7 +165,11 @@ libcrun_seccomp_notify_plugins (struct seccomp_notify_context_s *ctx, int seccom
 
   ret = ioctl (seccomp_fd, SECCOMP_IOCTL_NOTIF_RECV, ctx->sreq);
   if (UNLIKELY (ret < 0))
-    return crun_make_error (err, errno, "ioctl");
+    {
+      if (errno == ENOENT)
+        return 0;
+      return crun_make_error (err, errno, "ioctl");
+    }
 
   for (i = 0; i < ctx->n_plugins; i++)
     {