diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-10-05 10:00:15 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2023-10-05 10:30:27 -0300 |
commit | a8c44318e595e2f220baf9c0f43020cd09e852a9 (patch) | |
tree | 5da9b13fa256c24ad3910cfc1baf65fc47bb40a5 | |
parent | 8cd6203288cfadc4408bd1aff985e48c9d71f563 (diff) | |
download | glibc-a8c44318e595e2f220baf9c0f43020cd09e852a9.tar.gz glibc-a8c44318e595e2f220baf9c0f43020cd09e852a9.tar.xz glibc-a8c44318e595e2f220baf9c0f43020cd09e852a9.zip |
elf: Do not parse ill-formatted strings
-rw-r--r-- | elf/dl-tunables.c | 36 | ||||
-rw-r--r-- | elf/tst-tunables.c | 13 |
2 files changed, 37 insertions, 12 deletions
diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index 59bee61124..6b5661dce4 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -154,17 +154,26 @@ __tunable_set_val (tunable_id_t id, tunable_val_t *valp, tunable_num_t *minp, do_tunable_update_val (cur, valp, minp, maxp); } +struct tunable_toset_t +{ + tunable_t *t; + const char *value; +}; + +enum { tunables_list_size = array_length (tunable_list) }; + /* Parse the tunable string VALSTRING. VALSTRING is a duplicated values, where delimiters ':' are replaced with '\0', so string tunables are null terminated. */ -static void -parse_tunables (char *valstring) +static int +parse_tunables_string (char *valstring, struct tunable_toset_t *tunables) { if (valstring == NULL || *valstring == '\0') - return; + return 0; char *p = valstring; bool done = false; + int ntunables = 0; while (!done) { @@ -177,7 +186,7 @@ parse_tunables (char *valstring) /* If we reach the end of the string before getting a valid name-value pair, bail out. */ if (*p == '\0') - break; + return 0; /* We did not find a valid name-value pair before encountering the colon. */ @@ -190,30 +199,41 @@ parse_tunables (char *valstring) /* Skip the ':' or '='. */ p++; - const char *value = p; + char *value = p; while (*p != '=' && *p != ':' && *p != '\0') p++; if (*p == '=') - break; + return 0; else if (*p == '\0') done = true; else *p++ = '\0'; /* Add the tunable if it exists. */ - for (size_t i = 0; i < sizeof (tunable_list) / sizeof (tunable_t); i++) + for (size_t i = 0; i < tunables_list_size; i++) { tunable_t *cur = &tunable_list[i]; if (tunable_is_name (cur->name, name)) { - tunable_initialize (cur, value); + tunables[ntunables++] = (struct tunable_toset_t) { cur, value }; break; } } } + + return ntunables; +} + +static void +parse_tunables (char *valstring) +{ + struct tunable_toset_t tunables[tunables_list_size]; + int ntunables = parse_tunables_string (valstring, tunables); + for (int i = 0; i < ntunables; i++) + tunable_initialize (tunables[i].t, tunables[i].value); } /* Initialize the tunables list from the environment. For now we only use the diff --git a/elf/tst-tunables.c b/elf/tst-tunables.c index 8e9df38564..2d9e5a21f9 100644 --- a/elf/tst-tunables.c +++ b/elf/tst-tunables.c @@ -159,7 +159,7 @@ static const struct test_t 0, 0, }, - /* If there is a ill-formatted key=value, everything after is also ignored. */ + /* Ill-formatted tunables string is not parsed. */ { "glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096:glibc.malloc.check=2", 0, @@ -184,13 +184,18 @@ static const struct test_t 0, 0, }, - /* Valid tunables set before ill-formatted ones are set. */ { "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096=4096", - 2, 0, 0, - } + 0, + }, + { + "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096=4096", + 0, + 0, + 0, + }, }; static int |