erts: Include foreign static linked drivers in taints

That is, driver added with config option --enable-static-drivers.

4 files changed, 34 insertions, 25 deletions

diff --git a/erts/emulator/beam/erl_bif_ddll.c b/erts/emulator/beam/erl_bif_ddll.c
index 8220ba97a2..294bce115f 100644
--- a/erts/emulator/beam/erl_bif_ddll.c
+++ b/erts/emulator/beam/erl_bif_ddll.c
@@ -1506,14 +1506,6 @@ static int do_load_driver_entry(DE_Handle *dh, char *path, char *name)
 	goto error;
     }
 
-    {
-        Eterm name_atom = erts_atom_put((byte*)name, sys_strlen(name),
-                                        ERTS_ATOM_ENC_LATIN1, 0);
-        if (is_non_value(name_atom))
-            goto error;
-        erts_add_taint(name_atom);
-    }
-
     erts_atomic_init_nob(&(dh->refc), (erts_aint_t) 0);
     erts_atomic32_init_nob(&dh->port_count, 0);
     dh->full_path = erts_alloc(ERTS_ALC_T_DDLL_HANDLE, sys_strlen(path) + 1);
@@ -1521,7 +1513,7 @@ static int do_load_driver_entry(DE_Handle *dh, char *path, char *name)
     dh->flags = 0;
     dh->status = ERL_DE_OK;
 
-    if (erts_add_driver_entry(dp, dh, 1) != 0 /* io.c */) { 
+    if (erts_add_driver_entry(dp, dh, 1, 1) != 0 /* io.c */) {
 	/*
 	 * The init in the driver struct did not return 0 
 	 */
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index 8a746ea4b1..c8354f9fcf 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1152,7 +1152,7 @@ typedef struct {
 #define ERTS_SPAWN_DRIVER 1
 #define ERTS_SPAWN_EXECUTABLE 2
 #define ERTS_SPAWN_ANY (ERTS_SPAWN_DRIVER | ERTS_SPAWN_EXECUTABLE)
-int erts_add_driver_entry(ErlDrvEntry *drv, DE_Handle *handle, int driver_list_locked);
+int erts_add_driver_entry(ErlDrvEntry *drv, DE_Handle *handle, int driver_list_locked, int taint);
 void erts_destroy_driver(erts_driver_t *drv);
 int erts_save_suspend_process_on_port(Port*, Process*);
 Port *erts_open_driver(erts_driver_t*, Eterm, char*, SysDriverOpts*, int *, int *);
@@ -1177,6 +1177,10 @@ void erts_lcnt_update_port_locks(int enable);
 #endif
 
 /* driver_tab.c */
+typedef struct {
+    ErlDrvEntry* de;
+    int taint;
+} ErtsStaticDriver;
 typedef void *(*ErtsStaticNifInitFPtr)(void);
 typedef struct ErtsStaticNifEntry_ {
     const char *nif_name;
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index 410fe89b02..5d9d7b6ed7 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -60,7 +60,7 @@ extern ErlDrvEntry spawn_driver_entry;
 #ifndef __WIN32__
 extern ErlDrvEntry forker_driver_entry;
 #endif
-extern ErlDrvEntry *driver_tab[]; /* table of static drivers, only used during initialization */
+extern ErtsStaticDriver driver_tab[]; /* table of static drivers, only used during initialization */
 
 erts_driver_t *driver_list; /* List of all drivers, static and dynamic. */
 erts_rwmtx_t erts_driver_list_lock; /* Mutex for driver list */
@@ -2964,7 +2964,7 @@ void erts_init_io(int port_tab_size,
 		  int port_tab_size_ignore_files,
 		  int legacy_port_tab)
 {
-    ErlDrvEntry** dp;
+    ErtsStaticDriver* dp;
     UWord common_element_size;
     erts_rwmtx_opt_t drv_list_rwmtx_opts = ERTS_RWMTX_OPT_DEFAULT_INITER;
     drv_list_rwmtx_opts.type = ERTS_RWMTX_TYPE_EXTREMELY_FREQUENT_READ;
@@ -3023,8 +3023,8 @@ void erts_init_io(int port_tab_size,
     init_driver(&forker_driver, &forker_driver_entry, NULL);
 #endif
     erts_init_static_drivers();
-    for (dp = driver_tab; *dp != NULL; dp++)
-	erts_add_driver_entry(*dp, NULL, 1);
+    for (dp = driver_tab; dp->de != NULL; dp++)
+	erts_add_driver_entry(dp->de, NULL, 1, dp->taint);
 
     erts_tsd_set(driver_list_lock_status_key, NULL);
     erts_rwmtx_rwunlock(&erts_driver_list_lock);
@@ -7697,13 +7697,14 @@ void add_driver_entry(ErlDrvEntry *drv){
      * Ignore result of erts_add_driver_entry, the init is not
      * allowed to fail when drivers are added by drivers.
      */
-    erts_add_driver_entry(drv, NULL, rec_lock != NULL); 
+    erts_add_driver_entry(drv, NULL, rec_lock != NULL, 0);
 }
 
-int erts_add_driver_entry(ErlDrvEntry *de, DE_Handle *handle, int driver_list_locked)
+int erts_add_driver_entry(ErlDrvEntry *de, DE_Handle *handle,
+                          int driver_list_locked, int taint)
 {
     erts_driver_t *dp = erts_alloc(ERTS_ALC_T_DRIVER, sizeof(erts_driver_t));
-    int res;
+    int err = 0;
 
     if (!driver_list_locked) {
 	erts_rwmtx_rwlock(&erts_driver_list_lock);
@@ -7720,9 +7721,21 @@ int erts_add_driver_entry(ErlDrvEntry *de, DE_Handle *handle, int driver_list_lo
 	erts_tsd_set(driver_list_lock_status_key, (void *) 1);
     }
 
-    res = init_driver(dp, de, handle);
+    if (taint) {
+        Eterm name_atom = erts_atom_put((byte*)de->driver_name,
+                                        sys_strlen(de->driver_name),
+                                        ERTS_ATOM_ENC_LATIN1, 0);
+        if (is_atom(name_atom))
+            erts_add_taint(name_atom);
+        else
+            err = 1;
+    }
+
+    if (!err) {
+        err = init_driver(dp, de, handle);
+    }
 
-    if (res != 0) {
+    if (err) {
 	/* 
 	 * Remove it all again...
 	 */
@@ -7737,7 +7750,7 @@ int erts_add_driver_entry(ErlDrvEntry *de, DE_Handle *handle, int driver_list_lo
 	erts_tsd_set(driver_list_lock_status_key, NULL);
 	erts_rwmtx_rwunlock(&erts_driver_list_lock);
     }
-    return res;
+    return err;
 }
 
 /* Not allowed for dynamic drivers */
diff --git a/erts/emulator/utils/make_driver_tab b/erts/emulator/utils/make_driver_tab
index cefb3e2504..b7bca1dc3a 100755
--- a/erts/emulator/utils/make_driver_tab
+++ b/erts/emulator/utils/make_driver_tab
@@ -95,22 +95,22 @@ foreach (@static_drivers) {
 }
 
 # The array itself
-print "\nErlDrvEntry *driver_tab[] =\n{\n";
+print "\nErtsStaticDriver driver_tab[] =\n{\n";
 
 foreach (@emu_drivers) {
-    print "    &${_}driver_entry,\n";
+    print "    {&${_}driver_entry, 0},\n";
 }
 
 foreach (@static_drivers) {
-    print "    NULL, /* ${_} */\n";
+    print "    {NULL, 1}, /* ${_} */\n";
 }
-print "    NULL\n};\n";
+print "    {NULL}\n};\n";
 
 print "void erts_init_static_drivers() {\n";
 
 my $index = 0;
 foreach (@static_drivers) {
-    print "    driver_tab[".(scalar @emu_drivers+$index)."] = ${_}_driver_init();\n";
+    print "    driver_tab[".(scalar @emu_drivers+$index)."].de = ${_}_driver_init();\n";
     $index++;
 }