From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 2A5B2386185C; Thu, 5 Oct 2023 13:13:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A5B2386185C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1696511622; bh=757AmQYdPCiJDphP0w1+DEBoiwu2c1ZhIcjOlkJkDBw=; h=From:To:Subject:Date:From; b=d0xbgINh5zUxG03QKUaA4wrILgqvPMWAYmfew67rLu5p3gscVO92FIXYKlsex5ueL VwS2SmNg9LsDmDyy0OQLZ/reWEvzxe/FIYdip8yIMCGRCZdvZYTda1vWgmwqjbJh14 RNj9rY1ZRcrUce07tBxxvFZ7m4bAcRhqM/8YSdd0= 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 process invalid tunable format X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/tunables X-Git-Oldrev: 3552e1dc2b6ba98a718b3f050e9cbfb9abda1768 X-Git-Newrev: 8cd6203288cfadc4408bd1aff985e48c9d71f563 Message-Id: <20231005131342.2A5B2386185C@sourceware.org> Date: Thu, 5 Oct 2023 13:13:42 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8cd6203288cfadc4408bd1aff985e48c9d71f563 commit 8cd6203288cfadc4408bd1aff985e48c9d71f563 Author: Adhemerval Zanella Date: Wed Oct 4 09:29:49 2023 -0300 elf: Do not process invalid tunable format Tunables string with with more than one '=' on its definition are parsed and enabled, and any subsequent '=' are ignored. It means that tunables in the form 'tunable=tunable=value' or 'tunable=value=value' are handled 'tunable=value'. This inputs are most likely user input error, which should not be accepted. Checked on x86_64-linux-gnu. Diff: --- elf/dl-tunables.c | 6 ++++-- elf/tst-tunables.c | 22 +++++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index a83bd2b8bc..59bee61124 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -192,10 +192,12 @@ parse_tunables (char *valstring) const char *value = p; - while (*p != ':' && *p != '\0') + while (*p != '=' && *p != ':' && *p != '\0') p++; - if (*p == '\0') + if (*p == '=') + break; + else if (*p == '\0') done = true; else *p++ = '\0'; diff --git a/elf/tst-tunables.c b/elf/tst-tunables.c index 0a9381ba1f..8e9df38564 100644 --- a/elf/tst-tunables.c +++ b/elf/tst-tunables.c @@ -159,24 +159,36 @@ static const struct test_t 0, 0, }, - /* The ill-formatted tunable is also skipped. */ + /* If there is a ill-formatted key=value, everything after is also ignored. */ { "glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096:glibc.malloc.check=2", - 2, + 0, 0, 0, }, - /* For an integer tunable, parse will stop on non number character. */ { "glibc.malloc.check=2=2", - 2, + 0, 0, 0, }, { "glibc.malloc.check=2=2:glibc.malloc.mmap_threshold=4096", + 0, + 0, + 0, + }, + { + "glibc.malloc.check=2=2:glibc.malloc.check=2", + 0, + 0, + 0, + }, + /* Valid tunables set before ill-formatted ones are set. */ + { + "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096=4096", 2, - 4096, + 0, 0, } };