public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/tunables] elf: Do not parse ill-formatted strings
@ 2023-10-06 14:28 Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2023-10-06 14:28 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a8c44318e595e2f220baf9c0f43020cd09e852a9
commit a8c44318e595e2f220baf9c0f43020cd09e852a9
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu Oct 5 10:00:15 2023 -0300
elf: Do not parse ill-formatted strings
Diff:
---
elf/dl-tunables.c | 36 ++++++++++++++++++++++++++++--------
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [glibc/azanella/tunables] elf: Do not parse ill-formatted strings
@ 2023-10-05 13:13 Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2023-10-05 13:13 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fa4c065c48cab3757eec5433c1b58d2c944022b0
commit fa4c065c48cab3757eec5433c1b58d2c944022b0
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu Oct 5 10:00:15 2023 -0300
elf: Do not parse ill-formatted strings
Diff:
---
elf/dl-tunables.c | 37 +++++++++++++++++++++++++++++--------
elf/tst-tunables.c | 13 +++++++++----
2 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c
index 59bee61124..bf465cdd45 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,42 @@ 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 };
+ //tunable_initialize (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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-06 14:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06 14:28 [glibc/azanella/tunables] elf: Do not parse ill-formatted strings Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2023-10-05 13:13 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).