From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 73E823858C2C for ; Thu, 30 Sep 2021 18:36:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 73E823858C2C Received: by mail-pl1-x633.google.com with SMTP id j4so3197760plx.4 for ; Thu, 30 Sep 2021 11:36:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OEN6EznZFC9Aq9j3NWqRuhBc7Tz7OBgSHf1gb6ewYHM=; b=kz1MuPGhSsgjv3fr/cjrX/kXxqsF0wSThEMjrkXX5QTOd0PbgjiabjcJAHxgJsOqWx itXgjG6xHDd4eRXu1OyUgmpBMZumN6uJNbgUbyOMdKR5xpY1N69I/2zk+hCJLNLYySIe eTnCRnoAStoOyz7JDSj2TJB8jsQnI/+BWkgL0Q24sePeh4PqYScyfkI6Hkxw/ovryLuF meQQRUCIL5QXEtPXI6Ideyhp59AcpvaK/trWHwkWOY9T2roONkFO1fzVK5EjDE8RvI8I fnI1479Ixe/xMMIicYRsuOS7KcceOPU6sPs55+JbySvMA0OmGze9v/uqGHyW8TA1/0Y8 g4wA== X-Gm-Message-State: AOAM532YOcLwJajIoi8ir2tPuLrXzAroXrTqIk2sOedFzaOFtby2Aor+ r1FAaqowkZP37TCwu0EsRh4SMTd+hc3O6piClQY= X-Google-Smtp-Source: ABdhPJwrNHOGEZJsQiwwtVYYhXH5/bQMdMvO//9xjOKSalDbaajm1e/xFReBynvO9WZbw1Pqg5GGTKyN4PJ9AJhk7UU= X-Received: by 2002:a17:90b:17c1:: with SMTP id me1mr15102273pjb.28.1633027017145; Thu, 30 Sep 2021 11:36:57 -0700 (PDT) MIME-Version: 1.0 References: <20210930182311.3718571-1-hjl.tools@gmail.com> <87v92h2a1t.fsf@oldenburg.str.redhat.com> In-Reply-To: <87v92h2a1t.fsf@oldenburg.str.redhat.com> From: "H.J. Lu" Date: Thu, 30 Sep 2021 11:36:21 -0700 Message-ID: Subject: Re: [PATCH v2] elf: Replace nsid with args.nsid [BZ #27609] To: Florian Weimer Cc: GNU C Library Content-Type: multipart/mixed; boundary="000000000000448f8905cd3abb66" X-Spam-Status: No, score=-3029.4 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, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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, 30 Sep 2021 18:37:00 -0000 --000000000000448f8905cd3abb66 Content-Type: text/plain; charset="UTF-8" On Thu, Sep 30, 2021 at 11:27 AM Florian Weimer wrote: > > * H. J. Lu: > > > do_dlopen calls _dl_open with nsid == __LM_ID_CALLER (-2), which calls > > dl_open_worker with args.nsid = nsid. dl_open_worker updates args.nsid > > if it is __LM_ID_CALLER. After dl_open_worker returns, use args.nsid > > instead of nsid. This fixes BZ #27609. > > --- > > elf/dl-open.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/elf/dl-open.c b/elf/dl-open.c > > index a25443f6d1..5295e931b0 100644 > > --- a/elf/dl-open.c > > +++ b/elf/dl-open.c > > @@ -886,7 +886,7 @@ no more namespaces available for dlmopen()")); > > /* Avoid keeping around a dangling reference to the libc.so link > > map in case it has been cached in libc_map. */ > > if (!args.libc_already_loaded) > > - GL(dl_ns)[nsid].libc_map = NULL; > > + GL(dl_ns)[args.nsid].libc_map = NULL; > > > > /* Remove the object from memory. It may be in an inconsistent > > state if relocation failed, for example. */ > > Patch looks okay. But could you reference the fixed commit in the > commit message? > Done. Here is the patch I am checking in. Thanks. -- H.J. --000000000000448f8905cd3abb66 Content-Type: text/x-patch; charset="US-ASCII"; name="v3-0001-elf-Replace-nsid-with-args.nsid-BZ-27609.patch" Content-Disposition: attachment; filename="v3-0001-elf-Replace-nsid-with-args.nsid-BZ-27609.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ku7a2y2u0 RnJvbSA3MzVmODBiMDhiOTEwYzVlMTBjOTVmYjVlYTcyYjM5NzI2YjE0M2JiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkRhdGU6 IFRodSwgMzAgU2VwIDIwMjEgMTA6Mjk6MTcgLTA3MDAKU3ViamVjdDogW1BBVENIIHYzXSBlbGY6 IFJlcGxhY2UgbnNpZCB3aXRoIGFyZ3MubnNpZCBbQlogIzI3NjA5XQoKY29tbWl0IGVjOTM1ZGVh NjMzMmNiMjJmOTg4MWNkMTE2MmJhZDE1NjE3M2Y0YjAKQXV0aG9yOiBGbG9yaWFuIFdlaW1lciA8 ZndlaW1lckByZWRoYXQuY29tPgpEYXRlOiAgIEZyaSBBcHIgMjQgMjI6MzE6MTUgMjAyMCArMDIw MAoKICAgIGVsZjogSW1wbGVtZW50IF9fbGliY19lYXJseV9pbml0CgpoYXMKCkBAIC04NTYsNiAr ODc2LDExIEBAIG5vIG1vcmUgbmFtZXNwYWNlcyBhdmFpbGFibGUgZm9yIGRsbW9wZW4oKSIpKTsK ICAgLyogU2VlIGlmIGFuIGVycm9yIG9jY3VycmVkIGR1cmluZyBsb2FkaW5nLiAgKi8KICAgaWYg KF9fZ2xpYmNfdW5saWtlbHkgKGV4Y2VwdGlvbi5lcnJzdHJpbmcgIT0gTlVMTCkpCiAgICAgewor ICAgICAgLyogQXZvaWQga2VlcGluZyBhcm91bmQgYSBkYW5nbGluZyByZWZlcmVuY2UgdG8gdGhl IGxpYmMuc28gbGluaworICAgbWFwIGluIGNhc2UgaXQgaGFzIGJlZW4gY2FjaGVkIGluIGxpYmNf bWFwLiAgKi8KKyAgICAgIGlmICghYXJncy5saWJjX2FscmVhZHlfbG9hZGVkKQorICBHTChkbF9u cylbbnNpZF0ubGliY19tYXAgPSBOVUxMOworCgpkb19kbG9wZW4gY2FsbHMgX2RsX29wZW4gd2l0 aCBuc2lkID09IF9fTE1fSURfQ0FMTEVSICgtMiksIHdoaWNoIGNhbGxzCmRsX29wZW5fd29ya2Vy IHdpdGggYXJncy5uc2lkID0gbnNpZC4gIGRsX29wZW5fd29ya2VyIHVwZGF0ZXMgYXJncy5uc2lk CmlmIGl0IGlzIF9fTE1fSURfQ0FMTEVSLiAgQWZ0ZXIgZGxfb3Blbl93b3JrZXIgcmV0dXJucywg aXQgaXMgd3JvbmcgdG8KdXNlIG5zaWQuCgpSZXBsYWNlIG5zaWQgd2l0aCBhcmdzLm5zaWQgYWZ0 ZXIgZGxfb3Blbl93b3JrZXIgcmV0dXJucy4gIFRoaXMgZml4ZXMKQlogIzI3NjA5LgotLS0KIGVs Zi9kbC1vcGVuLmMgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9lbGYvZGwtb3Blbi5jIGIvZWxmL2RsLW9wZW4uYwppbmRl eCBhMjU0NDNmNmQxLi41Mjk1ZTkzMWIwIDEwMDY0NAotLS0gYS9lbGYvZGwtb3Blbi5jCisrKyBi L2VsZi9kbC1vcGVuLmMKQEAgLTg4Niw3ICs4ODYsNyBAQCBubyBtb3JlIG5hbWVzcGFjZXMgYXZh aWxhYmxlIGZvciBkbG1vcGVuKCkiKSk7CiAgICAgICAvKiBBdm9pZCBrZWVwaW5nIGFyb3VuZCBh IGRhbmdsaW5nIHJlZmVyZW5jZSB0byB0aGUgbGliYy5zbyBsaW5rCiAJIG1hcCBpbiBjYXNlIGl0 IGhhcyBiZWVuIGNhY2hlZCBpbiBsaWJjX21hcC4gICovCiAgICAgICBpZiAoIWFyZ3MubGliY19h bHJlYWR5X2xvYWRlZCkKLQlHTChkbF9ucylbbnNpZF0ubGliY19tYXAgPSBOVUxMOworCUdMKGRs X25zKVthcmdzLm5zaWRdLmxpYmNfbWFwID0gTlVMTDsKIAogICAgICAgLyogUmVtb3ZlIHRoZSBv YmplY3QgZnJvbSBtZW1vcnkuICBJdCBtYXkgYmUgaW4gYW4gaW5jb25zaXN0ZW50CiAJIHN0YXRl IGlmIHJlbG9jYXRpb24gZmFpbGVkLCBmb3IgZXhhbXBsZS4gICovCi0tIAoyLjMxLjEKCg== --000000000000448f8905cd3abb66--