Changeset 97022e24935605949cb7664b5d9193ed7c1c499c

Timestamp:

07/11/09 16:03:08 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

83b11b7d1bf3372b39dfaa35a7dd1624530cd85f

Parents:

b05530c4ff96e00046ae4e9555794b66265081b2

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2009-07-11T16:03:08Z+0300

Message:

disabled execution through clone()

Files:

• lv2_ui.c (modified) (7 diffs)

lv2_ui.c

@@ -27 +27 @@
 
 //#define FORK_TIME_MEASURE
+
 #define USE_VFORK
+//#define USE_CLONE
+//#define USE_CLONE2
 
 #if defined(USE_VFORK)
 #define FORK vfork
 #define FORK_STR "vfork"
+#elif defined(USE_CLONE)
+#define FORK_STR "clone"
+#elif defined(USE_CLONE2)
+#define FORK_STR "clone2"
 #else
 #define FORK fork
 #define FORK_STR "fork"
 #endif
-
 
 #include <stdbool.h>
@@ -48 +54 @@
 #endif
 #include <unistd.h>
+#if defined(USE_CLONE) || defined(USE_CLONE2)
+# include <sched.h>
+#endif
 #include <fcntl.h>
 #include <locale.h>
@@ -228 +237 @@
 #endif
 
+#if defined(USE_CLONE) || defined(USE_CLONE2)
+
+static int clone_fn(void * context)
+{
+    execvp(*(const char **)context, (char **)context);
+    return -1;
+}
+
+#endif
+
 static
 LV2UI_Handle
@@ -248 +267 @@
   int oldflags;
   FORK_TIME_MEASURE_VAR;
+  const char * argv[8];
+  int ret;
 
   //printf("instantiate('%s', '%s') called\n", plugin_uri, bundle_path);
@@ -306 +327 @@
   control_ptr->visible = false;
 
+  argv[0] = "python";
+  argv[1] = filename;
+  argv[2] = plugin_uri;
+  argv[3] = bundle_path;
+  argv[4] = ui_host_ptr->plugin_human_id != NULL ? ui_host_ptr->plugin_human_id : "";
+  argv[5] = ui_recv_pipe;       /* reading end */
+  argv[6] = ui_send_pipe;       /* writting end */
+  argv[7] = NULL;
+
   FORK_TIME_MEASURE_BEGIN;
 
-  switch (FORK())
+#if defined(USE_CLONE)
+  {
+    int stack[8000];
+
+    ret = clone(clone_fn, stack + 4000, CLONE_VFORK, argv);
+    if (ret == -1)
+    {
+      fprintf(stderr, "clone() failed: %s\n", strerror(errno));
+      goto fail_free_control;
+    }
+  }
+#elif defined(USE_CLONE2)
+  fprintf(stderr, "clone2() exec not implemented yet\n");
+  goto fail_free_control;
+#else
+  ret = FORK();
+  switch (ret)
   {
   case 0:                       /* child process */
@@ -318 +364 @@
 #endif
 
-    execlp(
-      "python",
-      "python",
-      filename,
-      plugin_uri,
-      bundle_path,
-      ui_host_ptr->plugin_human_id != NULL ? ui_host_ptr->plugin_human_id : "",
-      ui_recv_pipe,             /* reading end */
-      ui_send_pipe,             /* writting end */
-      NULL);
+    execvp(argv[0], (char **)argv);
     fprintf(stderr, "exec of UI failed: %s", strerror(errno));
     exit(1);
@@ -334 +371 @@
     goto fail_free_control;
   }
+
+#endif
 
   FORK_TIME_MEASURE_END(FORK_STR "() time");