From patchwork Sat Mar 25 21:32:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Pluzhnikov X-Patchwork-Id: 1761186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=S4+SrSsr; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PkXQT2Nxvz1yXq for ; Sun, 26 Mar 2023 08:34:09 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C1E653858409 for ; Sat, 25 Mar 2023 21:34:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C1E653858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679780044; bh=pKBWHcQeedSocbJFgAomJNZjDqb1A2+/94oetBfM6l4=; h=Date:In-Reply-To:References:Subject:To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=S4+SrSsrhsXV7RB1LZQ8upZ4DrZp9F8YI9mYsBkAb9zypXNSiq+xEQaqIbZl1UxnE gfBd6UN8FPp+NnWNv2T/PCRoEtU9PAMlgMP2bovgtiUicBC1CG16T0s3D/Hnin+/jO Yj75v/WyISzHu5VjZ1vBFF0CnwYkilZcLdlnaG4M= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by sourceware.org (Postfix) with ESMTPS id A4FFE3858D20 for ; Sat, 25 Mar 2023 21:33:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A4FFE3858D20 Received: by mail-pl1-x649.google.com with SMTP id u11-20020a170902e80b00b001a043e84bdfso3341443plg.23 for ; Sat, 25 Mar 2023 14:33:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679780027; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pKBWHcQeedSocbJFgAomJNZjDqb1A2+/94oetBfM6l4=; b=OohWu1cqEThehWUJg6y7cg5iwp/6VcN6X4pEW0VK+hymsUFe1DUwTn0i5Tm+M+zhAv 3vpBx6feYFxxGfhbr2Lni19xhe3QfGQHqpSt/WX09RmRWS29Bg8iLVgnYf9Wz2mNaXqq VBhS3Sin1/aSCBVwXfmyLXSbe6iCCbhTQOjkBH52HhJMmrcgxspQg3wG5/SabsJb5XgE vTJhj2kyzmNpvIV1mYkO2PYXApIBbEG85sZQeLgndAUkDA77NpBJQ6g4VljoCygveiBf EwlnqmxEOXkMCiOwHx2zKmw5sexPFe00ywGXPmoKj0ZwaCccPA4SpCxRgZTfc/1ruydq Mb3w== X-Gm-Message-State: AAQBX9egoGC9Gs6ynbiorNBB/FieapbjtJYb0+nOIqvCYtIzIzMzHujV y3wit9+H1YhFRghwtTNrCkA7NW1fmIGDGRnElutYnvbVQOdaqnBzXSyZqQlenWzUCd3oe03NuuS qJ77hvtMiuu7/rT9iEzuE7n3O7nCPex85S3/Dr0nWVU/kQ6SOYtW84ouuYEwcjZ5jN7ULnuFx0W 47tcc= X-Google-Smtp-Source: AKy350ZU2ErKE3KbQ81yHb5vp7CHGnKVwJqhYGMuDwYUskrcin4XGUTYwp7WKTE+nZ3outNeC8jigLPXiyiROJ3SaA== X-Received: from elbrus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:12e9]) (user=ppluzhnikov job=sendgmr) by 2002:a17:902:ba8f:b0:1a2:1c7:1c2e with SMTP id k15-20020a170902ba8f00b001a201c71c2emr2412182pls.4.1679780027473; Sat, 25 Mar 2023 14:33:47 -0700 (PDT) Date: Sat, 25 Mar 2023 21:32:06 +0000 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230325213205.1218549-1-ppluzhnikov@google.com> Subject: [PATCH] Minor: don't call _dl_debug_update (which can have side effects) inside assert To: libc-alpha@sourceware.org Cc: Paul Pluzhnikov , Andreas Schwab X-Spam-Status: No, score=-19.7 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Paul Pluzhnikov via Libc-alpha From: Paul Pluzhnikov Reply-To: Paul Pluzhnikov Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" --- elf/dl-open.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/elf/dl-open.c b/elf/dl-open.c index 91a2d8a538..d46956ea21 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -578,7 +578,8 @@ dl_open_worker_begin (void *a) if ((mode & RTLD_GLOBAL) && new->l_global == 0) add_to_global_update (new); - assert (_dl_debug_update (args->nsid)->r_state == RT_CONSISTENT); + const int r_state = _dl_debug_update (args->nsid)->r_state; + assert (r_state == RT_CONSISTENT); return; } @@ -927,7 +928,8 @@ no more namespaces available for dlmopen()")); _dl_signal_exception (errcode, &exception, NULL); } - assert (_dl_debug_update (args.nsid)->r_state == RT_CONSISTENT); + const int r_state = _dl_debug_update (args.nsid)->r_state; + assert (r_state == RT_CONSISTENT); /* Release the lock. */ __rtld_lock_unlock_recursive (GL(dl_load_lock));