From patchwork Mon Aug 2 20:52:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 44555 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 0E155388A818 for ; Mon, 2 Aug 2021 20:53:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E155388A818 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1627937585; bh=VXkU9YOjx749kSI/bQzi8GPbBGTvrFIGyGgo6FoKBGQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wTGkcDgxqNdd4WenNwt2GcAwjIyEgOcjQnyRZsqBdczBML2xQTDK7LbGt8WhA6+gU JmsQ+aNlk6H//1QwBL3aNimA05m3D+rkb8SDKvYMjRfwoJse8PvbSBIywmqePONd5k pNvJ57jDyx62w9XQWWtFaRS9Z+7FK40DoTrGdUEc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by sourceware.org (Postfix) with ESMTPS id EC8573853800 for ; Mon, 2 Aug 2021 20:52:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EC8573853800 Received: by mail-pj1-x1034.google.com with SMTP id mz5-20020a17090b3785b0290176ecf64922so757019pjb.3 for ; Mon, 02 Aug 2021 13:52:42 -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=VXkU9YOjx749kSI/bQzi8GPbBGTvrFIGyGgo6FoKBGQ=; b=dPu5oYSXixyDBCbrrt8/+83HZ3BQ7dJITdxdTGFVqyhOnRdFCczHzb6C/M4GbVRq/H ha90zrIQX3REq5p44N5E9bTJ+tp6DrOiTAL8vJ5GLpH8xACrseCGFl07Shd62IGDVHb/ 0qcKqj4tC+XKxKjW0uc6IvrCeGbXNlDXBalevUSnqWNtTDP5/1ICVglmlE2HVPDqPmXY fjvsGwV0b+Kh2JSDpWp9ecOZPJt63mYls/MuMUXgKsCOpD9wgHaBMvJEKfJyyjE4D+Vx 4//1Zuf8PwkvrM1CFpGQiRNrwdnePLe3uEb63HN8Goy3FW5ZXad7qotmD/1ISG4tNc0K gfzw== X-Gm-Message-State: AOAM531p/r6FnuL+mQyRAhXqDie6PAqKE2RgxIO9ZYtqgzXIFZVVrwe4 Of05WplDFlL8iE6h3zOgC18aaELi+xk= X-Google-Smtp-Source: ABdhPJxZYCm7L6DhmAHDv36FAk1rtPp6m7hzLTJZwYtUsPAIorEiYOqTc74jl/eNUkBESNN001bsrg== X-Received: by 2002:a17:90b:1882:: with SMTP id mn2mr701258pjb.213.1627937562038; Mon, 02 Aug 2021 13:52:42 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.58.38.240]) by smtp.gmail.com with ESMTPSA id c14sm791254pjr.3.2021.08.02.13.52.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 13:52:41 -0700 (PDT) Received: from gnu-tgl-2.localdomain (gnu-tgl-2 [192.168.1.34]) by gnu-cfl-2.localdomain (Postfix) with ESMTPS id 4D8BFC02C7 for ; Mon, 2 Aug 2021 13:52:40 -0700 (PDT) Received: from gnu-tgl-2.lan (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id A869C3002BA for ; Mon, 2 Aug 2021 13:52:36 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] ld.so: Don't fill the DT_DEBUG entry in ld.so [BZ #28129] Date: Mon, 2 Aug 2021 13:52:36 -0700 Message-Id: <20210802205236.322869-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3033.6 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.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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Linker creates the DT_DEBUG entry only in executables. Don't fill the non-existent DT_DEBUG entry in ld.so with the run-time address of the r_debug structure. This fixes BZ #28129. --- elf/rtld.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index d733359eaf..929bd41c07 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1763,17 +1763,11 @@ dl_main (const ElfW(Phdr) *phdr, #ifdef ELF_MACHINE_DEBUG_SETUP /* Some machines (e.g. MIPS) don't use DT_DEBUG in this way. */ ELF_MACHINE_DEBUG_SETUP (main_map, r); - ELF_MACHINE_DEBUG_SETUP (&GL(dl_rtld_map), r); #else if (main_map->l_info[DT_DEBUG] != NULL) /* There is a DT_DEBUG entry in the dynamic section. Fill it in with the run-time address of the r_debug structure */ main_map->l_info[DT_DEBUG]->d_un.d_ptr = (ElfW(Addr)) r; - - /* Fill in the pointer in the dynamic linker's own dynamic section, in - case you run gdb on the dynamic linker directly. */ - if (GL(dl_rtld_map).l_info[DT_DEBUG] != NULL) - GL(dl_rtld_map).l_info[DT_DEBUG]->d_un.d_ptr = (ElfW(Addr)) r; #endif /* We start adding objects. */