From patchwork Thu Jun 4 19:58:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 39477 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 935DA388E834; Thu, 4 Jun 2020 19:58:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 935DA388E834 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591300689; bh=AB/a1nRf5pXlfQDf2q5AzWHA2r7KvTAu5iPg4E4ArU0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CeeDe+YXVHZ2X0R2iy0xFsLMlNC+v1BMoFcBHdjoiTTgABPzSs9RVx1vIYleerVbK VGPHjt8Sg7RL133zVOVBN5CTfHA/jgJ1iCSFrNdlqsZSm0bUjWCP5Ofohb7Y6cNGd3 gfCtgqblUjZP1hvSKdU9bBS0KO+h+8HmgdPDGCw0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by sourceware.org (Postfix) with ESMTPS id 2B71E3851C3B for ; Thu, 4 Jun 2020 19:58:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2B71E3851C3B Received: by mail-pj1-x1044.google.com with SMTP id m2so1695826pjv.2 for ; Thu, 04 Jun 2020 12:58:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=AB/a1nRf5pXlfQDf2q5AzWHA2r7KvTAu5iPg4E4ArU0=; b=MjeOXPa1Omz+7Y9C28orzc3Ffo3vyuANK2+kdeNACoCLE/IoJQjuyCHlQq8r9CFXo2 pYGDZTIcTn/N8ug/gQeZCeWNxSuM1GXPj7pzXlkZxW2XfuE4OOe5KATn7Jzb6ICaLehE l/N9++q3F5y7JXTMfl43NuWFptbVtinf6s1BYE4nfRhERMIOBuY68ey0HquWDFb93hun Akr22jxC+WFj3WTKQbt8TzCH9jE9iYCBFohOoQ8fNAWoZdNk8oXVCesm45NJnnXDNYUk zW804MoRu9klvBxIaN1UZVArD7gADXbqSKJR09gPXXJ1zk9wtB6K2ReWQeJSbixWwdM9 YsnQ== X-Gm-Message-State: AOAM532yxbKJ4XwyfDawBq0a+q4JTtisDfEY+xPwJrNmX+EufyG+eQ3A K8t9dHphx0m/VFg51EW34flM4/1u X-Google-Smtp-Source: ABdhPJyDEYKRNTwfQKL3422cg6qSvSv5hTBVH6tujsgxq5JhxP980BxSOQItsEQVen4bz3RoVDMfrg== X-Received: by 2002:a17:90a:df16:: with SMTP id gp22mr7754487pjb.6.1591300686070; Thu, 04 Jun 2020 12:58:06 -0700 (PDT) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id z138sm5351846pfc.70.2020.06.04.12.58.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2020 12:58:05 -0700 (PDT) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 99DB51A0238 for ; Thu, 4 Jun 2020 12:58:04 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] Replace val with __val in TUNABLE_SET_VAL_IF_VALID_RANGE Date: Thu, 4 Jun 2020 12:58:04 -0700 Message-Id: <20200604195804.1502565-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" There are: #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) \ ^^^ Should be __val { \ (__cur)->val.numval = (val); \ ^^^ Should be __val (__cur)->initialized = true; \ } \ }) Luckily since all TUNABLE_SET_VAL_IF_VALID_RANGE usages are TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, int64_t); this didn't cause any issues. Reviewed-by: Carlos O'Donell --- elf/dl-tunables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index a1001fe313..26e6e26612 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -93,9 +93,9 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val, __type min = (__cur)->type.min; \ __type max = (__cur)->type.max; \ \ - if ((__type) (__val) >= min && (__type) (val) <= max) \ + if ((__type) (__val) >= min && (__type) (__val) <= max) \ { \ - (__cur)->val.numval = val; \ + (__cur)->val.numval = (__val); \ (__cur)->initialized = true; \ } \ })