libs/libc/modlib/modlib_bind.c: Fix system crash if modlib_bind fails

Addrenv is changed to the newly created process' one in the beginning of modlib_bind, and needs to be changed always when returning from the function; also in error cases. Signed-off-by: Jukka Laitinen <[email protected]>
apache · Feb 14, 2025 · 18c3e76 · 18c3e76
1 parent 5b9d535
commit 18c3e76
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/libs/libc/modlib/modlib_bind.c b/libs/libc/modlib/modlib_bind.c
@@ -938,7 +938,7 @@ int modlib_bind(FAR struct module_s *modp,
   ret = modlib_findsymtab(loadinfo);
   if (ret < 0)
     {
-      return ret;
+      goto errout_with_addrenv;
     }
 
   /* Process relocations in every allocated section */
@@ -989,7 +989,7 @@ int modlib_bind(FAR struct module_s *modp,
 
           if (ret < 0)
             {
-              return ret;
+              goto errout_with_addrenv;
             }
         }
       else
@@ -1042,7 +1042,7 @@ int modlib_bind(FAR struct module_s *modp,
 
       if (ret < 0)
         {
-          return ret;
+          goto errout_with_addrenv;
         }
     }
 
@@ -1076,6 +1076,8 @@ int modlib_bind(FAR struct module_s *modp,
     }
 #endif
 
+errout_with_addrenv:
+
 #ifdef CONFIG_ARCH_ADDRENV
   if (loadinfo->addrenv != NULL)
     {