From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) by sourceware.org (Postfix) with ESMTPS id 605C93874C36 for ; Thu, 4 Feb 2021 13:44:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 605C93874C36 Received: by mail-qv1-xf31.google.com with SMTP id j4so1694995qvk.6 for ; Thu, 04 Feb 2021 05:44:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=FPI+oUcidPJoV/XEa582UOApMPvRWWAAF/XbIkoO9F4=; b=U0cwruOt7wcKsX5qti3b6Bc3JxE0d0akDyhby1QCoQMTCwz7S9CX+Zmm6iUO1p5PU5 GBRGHZNSfw4tZJNAT1a/8bA23rpPwpId4PgX1GeDnYVvW2zWJulQX6X5H1WbrZ0Z/Bn3 fNMYcukp8edv1Z/dNqD+XrXhC6jtsgBOPc+G8mAC0z2VN8IFGr1r9DEuxHcPExVmHRE+ /WGELOZxDq3sMQHrl9Xyl79FR9STHfudP7PSv0fD1Ic/fBp12iy6Ya6bt+GW6RaDXbWs ggqyJ1qy3fq9VgWA695hBAYTDmd/DL6p3FDpu9Theq46aBiBWecLFjLrqdrnoxfadZnb Lkfw== X-Gm-Message-State: AOAM533+XL06pq+Z7gc+DHM9IUDgam/thvs5fh4HypetmrXC0QG9zp0W ynAn/WlgYVM0kP8/d/3UleT1QQ== X-Google-Smtp-Source: ABdhPJysWTEZPbL4zOUPhpHeNoCE6aPvmCJashCocVJ9vFNqhIXWeQ5lsTgk9U/YLRJavt/Mx+2UXg== X-Received: by 2002:a0c:f38d:: with SMTP id i13mr7294148qvk.33.1612446284727; Thu, 04 Feb 2021 05:44:44 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v18sm5345802qkv.62.2021.02.04.05.44.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Feb 2021 05:44:44 -0800 (PST) Subject: Re: [PATCH 1/3] Fix casts when setting tunable range To: libc-alpha@sourceware.org, Siddhesh Poyarekar References: <20210203173406.2075480-1-siddhesh@sourceware.org> <20210203173406.2075480-2-siddhesh@sourceware.org> Cc: Florian Weimer From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <8a85394c-20b3-c810-826f-1575b9e659ee@linaro.org> Date: Thu, 4 Feb 2021 10:44:41 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210203173406.2075480-2-siddhesh@sourceware.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Feb 2021 13:44:47 -0000 On 03/02/2021 14:34, Siddhesh Poyarekar via Libc-alpha wrote: > Cast tunable min and max to target type before comparison so that we > don't mix comparison of signed and unsigned types. > --- > elf/dl-tunables.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c > index b1a50b8469..488be4bbf1 100644 > --- a/elf/dl-tunables.c > +++ b/elf/dl-tunables.c > @@ -107,6 +107,8 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val, > > #define TUNABLE_SET_BOUNDS_IF_VALID(__cur, __minp, __maxp, __type) \ > ({ \ > + __type curmin = (__cur)->type.min; \ > + __type curmax = (__cur)->type.max; \ > if (__minp != NULL) \ > { \ > /* MIN is specified. */ \ > @@ -115,15 +117,13 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val, > { \ > /* Both MIN and MAX are specified. */ \ > __type max = *((__type *) __maxp); \ > - if (max >= min \ > - && max <= (__cur)->type.max \ > - && min >= (__cur)->type.min) \ > + if (max >= min && max <= curmax && min >= curmin) \ > { \ > (__cur)->type.min = min; \ > (__cur)->type.max = max; \ > } \ > } \ > - else if (min > (__cur)->type.min && min <= (__cur)->type.max) \ > + else if (min > curmin && min <= curmax) \ > { \ > /* Only MIN is specified. */ \ > (__cur)->type.min = min; \ > @@ -133,7 +133,7 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val, > { \ > /* Only MAX is specified. */ \ > __type max = *((__type *) __maxp); \ > - if (max < (__cur)->type.max && max >= (__cur)->type.min) \ > + if (max < curmax && max >= curmin) \ > (__cur)->type.max = max; \ > } \ > }) > Wouldn't be better to just get rid of this macro mess (which has cause some issue on the internal syscall mechanism where macro arguments were not correctly evaluated) and use proper functions instead? Something like (not sure about the function generation macros, open coded them might be clear since I don't foresee we adding more different type): --- diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index b1a50b8469..fa9bccfb29 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -93,50 +93,52 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val, return NULL; } -#define TUNABLE_SET_VAL_IF_VALID_RANGE(__cur, __val, __type) \ -({ \ - __type min = (__cur)->type.min; \ - __type max = (__cur)->type.max; \ - \ - if ((__type) (__val) >= min && (__type) (__val) <= max) \ - { \ - (__cur)->val.numval = (__val); \ - (__cur)->initialized = true; \ - } \ -}) - -#define TUNABLE_SET_BOUNDS_IF_VALID(__cur, __minp, __maxp, __type) \ -({ \ - if (__minp != NULL) \ - { \ - /* MIN is specified. */ \ - __type min = *((__type *) __minp); \ - if (__maxp != NULL) \ - { \ - /* Both MIN and MAX are specified. */ \ - __type max = *((__type *) __maxp); \ - if (max >= min \ - && max <= (__cur)->type.max \ - && min >= (__cur)->type.min) \ - { \ - (__cur)->type.min = min; \ - (__cur)->type.max = max; \ - } \ - } \ - else if (min > (__cur)->type.min && min <= (__cur)->type.max) \ - { \ - /* Only MIN is specified. */ \ - (__cur)->type.min = min; \ - } \ - } \ - else if (__maxp != NULL) \ - { \ - /* Only MAX is specified. */ \ - __type max = *((__type *) __maxp); \ - if (max < (__cur)->type.max && max >= (__cur)->type.min) \ - (__cur)->type.max = max; \ - } \ -}) +#define DEFINE_TUNABLE_SET_VAL_IF_VALID_RANGE(__type) \ +static void \ +do_tunable_set_val_if_valid_range_##__type(tunable_t *cur, __type val) \ +{ \ + __type min = cur->type.min; \ + __type max = cur->type.max; \ + if (val >= min && val <= max) \ + { \ + cur->val.numval = val; \ + cur->initialized = true; \ + } \ +} +DEFINE_TUNABLE_SET_VAL_IF_VALID_RANGE (int64_t) +DEFINE_TUNABLE_SET_VAL_IF_VALID_RANGE (uint64_t) + +#define DEFINE_TUNABLE_SET_BOUNDS_IF_VALID(__type) \ +static void \ +do_tunable_update_val_##__type (tunable_t *cur, const __type *minp, \ + const __type *maxp) \ +{ \ + if (minp != NULL) \ + { \ + __type min = *minp; \ + if (maxp != NULL) \ + { \ + __type max = *maxp; \ + if (max >= min \ + && max <= cur->type.max \ + && min >= cur->type.min) \ + { \ + cur->type.min = min; \ + cur->type.max = max; \ + } \ + } \ + else if (min > cur->type.min && min <= cur->type.max) \ + cur->type.min = min; \ + } \ + else if (maxp != NULL) \ + { \ + __type max = *maxp; \ + if (max < cur->type.max && max >= cur->type.min) \ + cur->type.max = max; \ + } \ +} +DEFINE_TUNABLE_SET_BOUNDS_IF_VALID (int64_t) +DEFINE_TUNABLE_SET_BOUNDS_IF_VALID (uint64_t) static void do_tunable_update_val (tunable_t *cur, const void *valp, @@ -150,28 +152,17 @@ do_tunable_update_val (tunable_t *cur, const void *valp, switch (cur->type.type_code) { case TUNABLE_TYPE_INT_32: - { - TUNABLE_SET_BOUNDS_IF_VALID (cur, minp, maxp, int64_t); - TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, int64_t); - break; - } + do_tunable_update_val_int64_t (cur, minp, maxp); + do_tunable_set_val_if_valid_range_int64_t (cur, val); + break; case TUNABLE_TYPE_UINT_64: - { - TUNABLE_SET_BOUNDS_IF_VALID (cur, minp, maxp, uint64_t); - TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, uint64_t); - break; - } case TUNABLE_TYPE_SIZE_T: - { - TUNABLE_SET_BOUNDS_IF_VALID (cur, minp, maxp, uint64_t); - TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, uint64_t); - break; - } + do_tunable_update_val_uint64_t (cur, minp, maxp); + do_tunable_set_val_if_valid_range_uint64_t (cur, val); + break; case TUNABLE_TYPE_STRING: - { - cur->val.strval = valp; - break; - } + cur->val.strval = valp; + break; default: __builtin_unreachable (); }