Changeset 985e0f15 in mainline

Timestamp:

2019-05-18T21:42:02Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

87bc11f

Parents:

1e8b633

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-05-17 13:04:30)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-05-18 21:42:02)

Message:

Removing exit() from lib rtld

Several functions in the library rtld called
exit() from stdlib when an error occured. This
commit removes those calls and replace it with a
proper failure response

Location:

uspace/lib/c

Files:

• generic/dlfcn.c (modified) (2 diffs)
• generic/rtld/module.c (modified) (9 diffs)
• generic/rtld/rtld.c (modified) (1 diff)
• include/rtld/module.h (modified) (1 diff)

uspace/lib/c/generic/dlfcn.c

@@ -35 +35 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -53 +54 @@
         if (m == NULL) {
                 m = module_load(runtime_env, path, mlf_local);
-                module_load_deps(m, mlf_local);
+                if (module_load_deps(m, mlf_local) != EOK) {
+                        return NULL;
+                }
+
                 /* Now relocate. */
                 module_process_relocs(m);

uspace/lib/c/generic/rtld/module.c

@@ -187 +187 @@
         if (m == NULL) {
                 printf("malloc failed\n");
-                exit(1);
+                goto error;
         }
 
@@ -198 +198 @@
         if (str_size(name) > NAME_BUF_SIZE - 2) {
                 printf("soname too long. increase NAME_BUF_SIZE\n");
-                exit(1);
+                goto error;
         }
 
@@ -210 +210 @@
         if (rc != EE_OK) {
                 printf("Failed to load '%s'\n", name_buf);
-                exit(1);
+                goto error;
         }
 
@@ -220 +220 @@
                 printf("Error: '%s' is not a dynamically-linked object.\n",
                     name_buf);
-                exit(1);
+                goto error;
         }
 
@@ -243 +243 @@
 
         return m;
+
+error:
+        if (m)
+                free(m);
+
+        return NULL;
 }
 
 /** Load all modules on which m (transitively) depends.
  */
-void module_load_deps(module_t *m, mlflags_t flags)
+errno_t module_load_deps(module_t *m, mlflags_t flags)
 {
         elf_dyn_t *dp;
@@ -274 +280 @@
                 /* There are no dependencies, so we are done. */
                 m->deps = NULL;
-                return;
+                return EOK;
         }
 
@@ -280 +286 @@
         if (!m->deps) {
                 printf("malloc failed\n");
-                exit(1);
+                return ENOMEM;
         }
 
@@ -294 +300 @@
                         if (!dm) {
                                 dm = module_load(m->rtld, dep_name, flags);
-                                module_load_deps(dm, flags);
+                                errno_t rc = module_load_deps(dm, flags);
+                                if (rc != EOK) {
+                                        return rc;
+                                }
                         }
 
@@ -302 +311 @@
                 ++dp;
         }
+
+        return EOK;
 }
 

uspace/lib/c/generic/rtld/rtld.c

@@ -125 +125 @@
 
         DPRINTF("Load all program dependencies\n");
-        module_load_deps(prog, 0);
+        errno_t rc = module_load_deps(prog, 0);
+        if (rc != EOK) {
+                return rc;
+        }
 
         /* Compute static TLS size */

uspace/lib/c/include/rtld/module.h

@@ -45 +45 @@
 extern module_t *module_find(rtld_t *, const char *);
 extern module_t *module_load(rtld_t *, const char *, mlflags_t);
-extern void module_load_deps(module_t *, mlflags_t);
+extern errno_t module_load_deps(module_t *, mlflags_t);
 extern module_t *module_by_id(rtld_t *, unsigned long);