Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ld.so: ignore LD_LIBRARY_PATH on suid binaries

Browse Source
This commit is contained in:
K. Lange 2019-06-25 20:46:57 +09:00
parent 302b772afa
commit 9d1d73a496
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linker/linker.c
View File

@ -79,6 +79,8 @@ static hashmap_t * objects_map;
/* Used for dlerror */
static char * last_error = NULL;
static int _target_is_suid = 0;
typedef struct elf_object {
FILE * file;
@ -115,7 +117,7 @@ static char * find_lib(const char * file) {
if (strchr(file, '/')) return strdup(file);
/* Collect the environment variable. */
char * path = getenv("LD_LIBRARY_PATH");
char * path = _target_is_suid ? NULL : getenv("LD_LIBRARY_PATH");
if (!path) {
/* Not set - this is the default state. Should probably read from config file? */
path = "/lib:/usr/lib";
@ -694,6 +696,20 @@ int main(int argc, char * argv[]) {
ex++;
}
/* Technically there's a potential time-of-use probably if we check like this but
* this is a toy linker for a toy OS so the fact that we even need to check suid
* bits at all is outrageous
*/
struct stat buf;
if (stat(file, &buf)) {
fprintf(stderr, "%s: target binary '%s' not available\n", argv[0], file);
}
/* Technically there's a way to know we're running suid, but let's check the actual file */
if (buf.st_mode & S_ISUID) {
_target_is_suid = 1;
}
/* Open the requested main object */
elf_t * main_obj = open_object(file);
_main_obj = main_obj;