From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 397B63875468; Thu, 5 Oct 2023 13:13:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 397B63875468 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1696511627; bh=FiE7A7/JC1YMDHMcIBxhlqRaWmSSHDl+TWaTxyLAOdc=; h=From:To:Subject:Date:From; b=OvFFnDuK0KvolDNMIba+VCGY9cHv6Gd1FjIqgGIG4hbxuIY1kYa5EZsjaidaHW+sk wAaQKusQx6v4Sg7Zee8e41Jdg/bLa/vMx6zvoKcpfernJB7Z4qAHmBT/TxW/VI/zo2 n8n/YoD8OQivqqugxcBqO7eQzzfFn2XFLWf8q7fI= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/tunables] elf: Do not parse ill-formatted strings X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/tunables X-Git-Oldrev: 8cd6203288cfadc4408bd1aff985e48c9d71f563 X-Git-Newrev: fa4c065c48cab3757eec5433c1b58d2c944022b0 Message-Id: <20231005131347.397B63875468@sourceware.org> Date: Thu, 5 Oct 2023 13:13:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fa4c065c48cab3757eec5433c1b58d2c944022b0 commit fa4c065c48cab3757eec5433c1b58d2c944022b0 Author: Adhemerval Zanella 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