From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 8 May 2012 20:36:39 +0000 (-0400)
Subject: Emulate RTLD_DEFAULT and RTLD_SELF w/ shl_findsym() using NULL
X-Git-Tag: SUDO_1_8_5~1^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6467b7b813d6714bd07f687dfa5eb9589fd4d8ca;p=sudo

Emulate RTLD_DEFAULT and RTLD_SELF w/ shl_findsym() using NULL
and PROG_HANDLE.
---

diff --git a/compat/dlopen.c b/compat/dlopen.c
index fa7fd71ff..73c7a9440 100644
--- a/compat/dlopen.c
+++ b/compat/dlopen.c
@@ -77,7 +77,13 @@ sudo_dlsym(void *vhandle, const char *symbol)
     shl_t handle = vhandle;
     void *value = NULL;
 
-    (void)shl_findsym(&handle, symbol, TYPE_UNDEFINED, &value);
+    /* RTLD_NEXT is not unsupported with shl_findsym(). */
+    if (vhandle == RTLD_DEFAULT)
+	(void)shl_findsym(NULL, symbol, TYPE_UNDEFINED, &value);
+    else if (vhandle == RTLD_SELF)
+	(void)shl_findsym(PROG_HANDLE, symbol, TYPE_UNDEFINED, &value);
+    else if (vhandle != RTLD_NEXT)
+	(void)shl_findsym(&handle, symbol, TYPE_UNDEFINED, &value);
 
     return value;
 }
@@ -117,9 +123,11 @@ sudo_dlsym(void *handle, const char *symbol)
 {
     struct sudo_preload_table *sym;
 
-    for (sym = sudo_preload_table; sym->name != NULL; sym++) {
-	if (strcmp(symbol, sym->name) == 0)
-	    return sym->address;
+    if (symbol != RTLD_NEXT && symbol != RTLD_DEFAULT && symbol != RTLD_SELF) {
+	for (sym = sudo_preload_table; sym->name != NULL; sym++) {
+	    if (strcmp(symbol, sym->name) == 0)
+		return sym->address;
+	}
     }
     return NULL;
 }