d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtld: constify most variables holding references to the environment values

Browse Source 
Reviewed by:	markj
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D31545
This commit is contained in:
Konstantin Belousov 2021-08-16 19:55:06 +03:00
parent b4b2748891
commit aa68b3bb2e
3 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libexec/rtld-elf/libmap.c
View File

@ -64,22 +64,22 @@ static const char *quickbasename(const char *);
#define rtld_isspace(c) ((c) == ' ' || (c) == '\t') #define rtld_isspace(c) ((c) == ' ' || (c) == '\t')
int int
lm_init(char *libmap_override) lm_init(const char *libmap_override)
{ {
char *p; char *l, *p;
dbg("lm_init(\"%s\")", libmap_override); dbg("lm_init(\"%s\")", libmap_override);
TAILQ_INIT(&lmp_head); TAILQ_INIT(&lmp_head);
lmc_parse_file(ld_path_libmap_conf); lmc_parse_file(ld_path_libmap_conf);
if (libmap_override) { if (libmap_override != NULL) {
/* /*
* Do some character replacement to make $LDLIBMAP look * Do some character replacement to make $LDLIBMAP look
* like a text file, then parse it. * like a text file, then parse it.
*/ */
libmap_override = xstrdup(libmap_override); l = xstrdup(libmap_override);
for (p = libmap_override; *p; p++) { for (p = l; *p != 0; p++) {
switch (*p) { switch (*p) {
case '=': case '=':
*p = ' '; *p = ' ';
@ -89,8 +89,8 @@ lm_init(char *libmap_override)
break; break;
} }
} }
lmc_parse(libmap_override, p - libmap_override); lmc_parse(l, p - l);
free(libmap_override); free(l);
} }
return (lm_count == 0); return (lm_count == 0);

2
libexec/rtld-elf/libmap.h
View File

@ -2,7 +2,7 @@
* $FreeBSD$ * $FreeBSD$
*/ */
int lm_init (char *); int lm_init(const char *);
void lm_fini (void); void lm_fini (void);
char * lm_find (const char *, const char *); char * lm_find (const char *, const char *);
char * lm_findn (const char *, const char *, const size_t); char * lm_findn (const char *, const char *, const size_t);

56
libexec/rtld-elf/rtld.c
View File

@ -123,7 +123,7 @@ static void linkmap_delete(Obj_Entry *);
static void load_filtees(Obj_Entry *, int flags, RtldLockState *); static void load_filtees(Obj_Entry *, int flags, RtldLockState *);
static void unload_filtees(Obj_Entry *, RtldLockState *); static void unload_filtees(Obj_Entry *, RtldLockState *);
static int load_needed_objects(Obj_Entry *, int); static int load_needed_objects(Obj_Entry *, int);
static int load_preload_objects(char *, bool); static int load_preload_objects(const char *, bool);
static Obj_Entry *load_object(const char *, int fd, const Obj_Entry *, int); static Obj_Entry *load_object(const char *, int fd, const Obj_Entry *, int);
static void map_stacks_exec(RtldLockState *); static void map_stacks_exec(RtldLockState *);
static int obj_disable_relro(Obj_Entry *); static int obj_disable_relro(Obj_Entry *);
@ -202,24 +202,24 @@ int __sys_openat(int, const char *, int, ...);
struct r_debug r_debug __exported; /* for GDB; */ struct r_debug r_debug __exported; /* for GDB; */
static bool libmap_disable; /* Disable libmap */ static bool libmap_disable; /* Disable libmap */
static bool ld_loadfltr; /* Immediate filters processing */ static bool ld_loadfltr; /* Immediate filters processing */
static char *libmap_override; /* Maps to use in addition to libmap.conf */ static const char *libmap_override;/* Maps to use in addition to libmap.conf */
static bool trust; /* False for setuid and setgid programs */ static bool trust; /* False for setuid and setgid programs */
static bool dangerous_ld_env; /* True if environment variables have been static bool dangerous_ld_env; /* True if environment variables have been
used to affect the libraries loaded */ used to affect the libraries loaded */
bool ld_bind_not; /* Disable PLT update */ bool ld_bind_not; /* Disable PLT update */
static char *ld_bind_now; /* Environment variable for immediate binding */ static const char *ld_bind_now; /* Environment variable for immediate binding */
static char *ld_debug; /* Environment variable for debugging */ static const char *ld_debug; /* Environment variable for debugging */
static bool ld_dynamic_weak = true; /* True if non-weak definition overrides static bool ld_dynamic_weak = true; /* True if non-weak definition overrides
weak definition */ weak definition */
static char *ld_library_path; /* Environment variable for search path */ static const char *ld_library_path;/* Environment variable for search path */
static char *ld_library_dirs; /* Environment variable for library descriptors */ static const char *ld_library_dirs;/* Environment variable for library descriptors */
static char *ld_preload; /* Environment variable for libraries to static const char *ld_preload; /* Environment variable for libraries to
load first */ load first */
static char *ld_preload_fds; /* Environment variable for libraries represented by static const char *ld_preload_fds;/* Environment variable for libraries represented by
descriptors */ descriptors */
static const char *ld_elf_hints_path; /* Environment variable for alternative hints path */ static const char *ld_elf_hints_path; /* Environment variable for alternative hints path */
static const char *ld_tracing; /* Called from ldd to print libs */ static const char *ld_tracing; /* Called from ldd to print libs */
static char *ld_utrace; /* Use utrace() to log events. */ static const char *ld_utrace; /* Use utrace() to log events. */
static struct obj_entry_q obj_list; /* Queue of all loaded objects */ static struct obj_entry_q obj_list; /* Queue of all loaded objects */
static Obj_Entry *obj_main; /* The main program shared object */ static Obj_Entry *obj_main; /* The main program shared object */
static Obj_Entry obj_rtld; /* The dynamic linker shared object */ static Obj_Entry obj_rtld; /* The dynamic linker shared object */
@ -367,8 +367,8 @@ enum {
}; };
struct ld_env_var_desc { struct ld_env_var_desc {
const char *n; const char * const n;
char *val; const char *val;
const bool unsecure; const bool unsecure;
}; };
#define LD_ENV_DESC(var, unsec) \ #define LD_ENV_DESC(var, unsec) \
@ -398,13 +398,13 @@ static struct ld_env_var_desc ld_env_vars[] = {
LD_ENV_DESC(TRACE_LOADED_OBJECTS_ALL, false), LD_ENV_DESC(TRACE_LOADED_OBJECTS_ALL, false),
}; };
static char * static const char *
ld_get_env_var(int idx) ld_get_env_var(int idx)
{ {
return (ld_env_vars[idx].val); return (ld_env_vars[idx].val);
} }
static char * static const char *
rtld_get_env_val(char **env, const char *name, size_t name_len) rtld_get_env_val(char **env, const char *name, size_t name_len)
{ {
char **m, *n, *v; char **m, *n, *v;
@ -493,8 +493,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
RtldLockState lockstate; RtldLockState lockstate;
struct stat st; struct stat st;
Elf_Addr *argcp; Elf_Addr *argcp;
char **argv, **env, **envp, *kexecpath, *library_path_rpath; char **argv, **env, **envp, *kexecpath;
const char *argv0, *binpath; const char *argv0, *binpath, *library_path_rpath;
struct ld_env_var_desc *lvd; struct ld_env_var_desc *lvd;
caddr_t imgentry; caddr_t imgentry;
char buf[MAXPATHLEN]; char buf[MAXPATHLEN];
@ -2600,36 +2600,42 @@ load_needed_objects(Obj_Entry *first, int flags)
} }
static int static int
load_preload_objects(char *p, bool isfd) load_preload_objects(const char *penv, bool isfd)
{ {
Obj_Entry *obj; Obj_Entry *obj;
const char *name;
size_t len;
char savech, *p, *psave;
int fd;
static const char delim[] = " \t:;"; static const char delim[] = " \t:;";
if (p == NULL) if (penv == NULL)
return (0); return (0);
p = psave = xstrdup(penv);
p += strspn(p, delim); p += strspn(p, delim);
while (*p != '\0') { while (*p != '\0') {
const char *name; len = strcspn(p, delim);
size_t len = strcspn(p, delim);
char savech;
int fd;
savech = p[len]; savech = p[len];
p[len] = '\0'; p[len] = '\0';
if (isfd) { if (isfd) {
name = NULL; name = NULL;
fd = parse_integer(p); fd = parse_integer(p);
if (fd == -1) if (fd == -1) {
free(psave);
return (-1); return (-1);
}
} else { } else {
name = p; name = p;
fd = -1; fd = -1;
} }
obj = load_object(name, fd, NULL, 0); obj = load_object(name, fd, NULL, 0);
if (obj == NULL) if (obj == NULL) {
free(psave);
return (-1); /* XXX - cleanup */ return (-1); /* XXX - cleanup */
}
obj->z_interpose = true; obj->z_interpose = true;
p[len] = savech; p[len] = savech;
p += len; p += len;
@ -2637,6 +2643,7 @@ load_preload_objects(char *p, bool isfd)
} }
LD_UTRACE(UTRACE_PRELOAD_FINISHED, NULL, NULL, 0, 0, NULL); LD_UTRACE(UTRACE_PRELOAD_FINISHED, NULL, NULL, 0, 0, NULL);
free(psave);
return (0); return (0);
} }
@ -6030,7 +6037,8 @@ rtld_strerror(int errnum)
char * char *
getenv(const char *name) getenv(const char *name)
{ {
return (rtld_get_env_val(environ, name, strlen(name))); return (__DECONST(char *, rtld_get_env_val(environ, name,
strlen(name))));
} }
/* malloc */ /* malloc */