AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 22:10:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: Remove glibc.rtld.enable_secure check from parse_tunables_string

Browse Source 
And move it to parse_tunables.  It avoids a string comparison for
each tunable.

Checked on aarch64-linux-gnu and x86_64-linux-gnu.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Adhemerval Zanella 2024-05-06 13:18:46 -03:00
parent bcae44ea85
commit c8a0e21da6
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
elf/dl-tunables.c
View File

@ -119,6 +119,17 @@ do_tunable_update_val (tunable_t *cur, const tunable_val_t *valp,
cur->initialized = true; cur->initialized = true;
} }
static bool
tunable_parse_num (const char *strval, size_t len, tunable_num_t *val)
{
char *endptr = NULL;
uint64_t numval = _dl_strtoul (strval, &endptr);
if (endptr != strval + len)
return false;
*val = (tunable_num_t) numval;
return true;
}
/* Validate range of the input value and initialize the tunable CUR if it looks /* Validate range of the input value and initialize the tunable CUR if it looks
good. */ good. */
static bool static bool
@ -128,11 +139,8 @@ tunable_initialize (tunable_t *cur, const char *strval, size_t len)
if (cur->type.type_code != TUNABLE_TYPE_STRING) if (cur->type.type_code != TUNABLE_TYPE_STRING)
{ {
char *endptr = NULL; if (!tunable_parse_num (strval, len, &val.numval))
uint64_t numval = _dl_strtoul (strval, &endptr);
if (endptr != strval + len)
return false; return false;
val.numval = (tunable_num_t) numval;
} }
else else
val.strval = (struct tunable_str_t) { strval, len }; val.strval = (struct tunable_str_t) { strval, len };
@ -223,17 +231,6 @@ parse_tunables_string (const char *valstring, struct tunable_toset_t *tunables)
if (tunable_is_name (cur->name, name)) if (tunable_is_name (cur->name, name))
{ {
tunables[i] = (struct tunable_toset_t) { cur, value, p - value }; tunables[i] = (struct tunable_toset_t) { cur, value, p - value };
/* Ignore tunables if enable_secure is set */
if (tunable_is_name ("glibc.rtld.enable_secure", name))
{
tunable_num_t val = (tunable_num_t) _dl_strtoul (value, NULL);
if (val == 1)
{
__libc_enable_secure = 1;
return 0;
}
}
break; break;
} }
} }
@ -242,6 +239,16 @@ parse_tunables_string (const char *valstring, struct tunable_toset_t *tunables)
return ntunables; return ntunables;
} }
static void
parse_tunable_print_error (const struct tunable_toset_t *toset)
{
_dl_error_printf ("WARNING: ld.so: invalid GLIBC_TUNABLES value `%.*s' "
"for option `%s': ignored.\n",
(int) toset->len,
toset->value,
toset->t->name);
}
static void static void
parse_tunables (const char *valstring) parse_tunables (const char *valstring)
{ {
@ -253,6 +260,21 @@ parse_tunables (const char *valstring)
return; return;
} }
/* Ignore tunables if enable_secure is set */
struct tunable_toset_t *tsec =
&tunables[TUNABLE_ENUM_NAME(glibc, rtld, enable_secure)];
if (tsec->t != NULL)
{
tunable_num_t val;
if (!tunable_parse_num (tsec->value, tsec->len, &val))
parse_tunable_print_error (tsec);
else if (val == 1)
{
__libc_enable_secure = 1;
return;
}
}
for (int i = 0; i < tunables_list_size; i++) for (int i = 0; i < tunables_list_size; i++)
{ {
if (tunables[i].t == NULL) if (tunables[i].t == NULL)
@ -260,11 +282,7 @@ parse_tunables (const char *valstring)
if (!tunable_initialize (tunables[i].t, tunables[i].value, if (!tunable_initialize (tunables[i].t, tunables[i].value,
tunables[i].len)) tunables[i].len))
_dl_error_printf ("WARNING: ld.so: invalid GLIBC_TUNABLES value `%.*s' " parse_tunable_print_error (&tunables[i]);
"for option `%s': ignored.\n",
(int) tunables[i].len,
tunables[i].value,
tunables[i].t->name);
} }
} }