From patchwork Fri Dec 20 20:27:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 103535 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 7C96F3858C51 for ; Fri, 20 Dec 2024 20:28:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C96F3858C51 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=cy51qGqM X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com [IPv6:2607:f8b0:4864:20::112b]) by sourceware.org (Postfix) with ESMTPS id 132C13858D26 for ; Fri, 20 Dec 2024 20:27:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 132C13858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 132C13858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::112b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734726459; cv=none; b=s0wPI0XJ0PYS4IvaL7YczUnDeJkuQxuWya/CUnK3nSfhqbiJbf8UOi28TYS81qQk66RdSSTWL6hiyWEQEcq6XOLIcZ2DxhahmFlwWKsHPLpJ9t/cbmNXgrW86jO7UQ/y/tUlOUylOZh+x5HQVUpmR7e+h2BD8nvgZCjhQKx84TA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734726459; c=relaxed/simple; bh=+GOveeF4Lyc7WCg44560cCR9aMFTamtG4QtkADuBNEI=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=mDqinzLCJJWVoeLHEG8U227AdZz86kXikmsb4tAuATEwOem0LLBGo26DbguOGQwgtlnJyrVMkatFGy2O6RfNIqEItZmgvkb9beGBcVok2+hazEqOr3NqMRcxa7OUsdIp42SbTaAj8cCrTn6cgz16+XCw+dGzBwaZsojGIpPEIv4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 132C13858D26 Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-6f2c8aea797so19162387b3.1 for ; Fri, 20 Dec 2024 12:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734726458; x=1735331258; darn=sourceware.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ASk0IUoqaXt6Mnw2L0PIFCaIMhVuX4riwp4giVKV23Q=; b=cy51qGqMiZiF/wAnQh9EqM+sJoOs1PRsOEpJ72LoHC27o1XQEyCe9ksCbL+Qdv8e/E FI/K7ABE7td96YGKvvBm1RNkGK8EpFIAT0MNbJSXbvhVFbxkM8YHHfvoTfxVmzoboIS1 QBSaEev2v5BHGii6quVe6xQ9nixF2O3ZrGbA5EFPjhqVSPXfEM1VKOy46nlUH+Ozu9Uq +rVKLF1tRqGsplKYKkzgwMKqI2FPxD2Ed5klHU93MGEqsZhZ6MziJ5IsSG8pDci6fWxl dJGTM3i6DW5P0torb8ATrbAO3Izoe+MXFC083fVFIyDz/gb+lDQY5M5o4m1sQlhVY8Hf rzgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734726458; x=1735331258; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ASk0IUoqaXt6Mnw2L0PIFCaIMhVuX4riwp4giVKV23Q=; b=CxxRZ1SsCu9fjA8e2AB8/anX8hdFYDmvikPL/UMX56SLC7ea8vYREPVIttw0343N+K olmDXj4KduGTubpwU4MMOzn7Joiq+L1fTQDQavjB2iUPTBbirlV+74klE9L/Ccpogp2I rvVc3XeUnS7E5zXec9oCL762mb5qpKY/+CdVFqyTDltMDn5+lrVxah5fs1KtKtBPoNzI 3qZeQcDkLudAhM6Uf5wJaNcKCzrPz2rgaoCuMwKIkG83n1CJos3nlp/ZGFN2G1GbhIjb bPDld2IhXQcLCzvCqOH+zPgGF8UAR1Wxz035zQ9rEXqZryuiqQo9GDYwZnbpsb9Vj9nQ IGxA== X-Forwarded-Encrypted: i=1; AJvYcCUPug3TWlI+dxYg6rl/J2SxNd8fD0fDoFE/LEbzTRQFgxHMmjALE4H3M0FbMpQ1HSfAstNsU9CiIREJ@sourceware.org X-Gm-Message-State: AOJu0Yxmbe9fZUSEnu3OXrdjgKrZjKfgVsYciHp/TBnbHO6ywGAUR+lh hQluYF5Q4QLogVXFgKheOeqN9Hozn/HxLF1t2pwAEE0PNwXeWDIHW0xhbw3dZYHoi0RKmehBgBq yPfvFJQrhmyp6YHsHcGDpD9w8ozk= X-Gm-Gg: ASbGnct0zSlRLQICzQT14tWqOfnx81Mb/0Qx/7M5C6k0VUtrGOw4e9bAFg2ulCuRsQD bp4O1548djTpOOotXwQeJ3BV82U+rgFBeN+x4 X-Google-Smtp-Source: AGHT+IFXoT6p/fzvs9SiJZh49M3tYMfvfz8JtLq1N+yLwzUAtxgdlWjpXUMG5xYvMuS9ik815QV13T3VDezGOpseSNM= X-Received: by 2002:a05:690c:4986:b0:6ee:6c7d:4888 with SMTP id 00721157ae682-6f3f8144f76mr38256437b3.22.1734726458204; Fri, 20 Dec 2024 12:27:38 -0800 (PST) MIME-Version: 1.0 References: <7e131f53a6289b35ba3eef5fe7f54f5b925b65c6.1734439824.git.fweimer@redhat.com> <0a55b8dd9cac2cb002cf00caad7000dc5080702f.1734439824.git.fweimer@redhat.com> In-Reply-To: From: "H.J. Lu" Date: Sat, 21 Dec 2024 04:27:02 +0800 Message-ID: Subject: [PATCH] Fix elf: Move _dl_rtld_map, _dl_rtld_audit_state out of GL [BZ #32488] To: Adhemerval Zanella Netto Cc: Florian Weimer , GNU C Library X-Spam-Status: No, score=-3016.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.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.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org On Fri, Dec 20, 2024 at 10:18 PM Adhemerval Zanella Netto wrote: > > > > On 17/12/24 09:51, Florian Weimer wrote: > > This avoids immediate GLIBC_PRIVATE ABI issues if the size of > > struct link_map or struct auditstate changes. > > > LGTM, thanks. > > Reviewed-by: Adhemerval Zanella > I am testing this patch and will check it in after testing is done. Also move _dl_rtld_map out of GL in sysdeps/x86_64/dl-cet.c. This fixes BZ #32488. From 4516edbf23d5d744c713a839c85e2262c90be31a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 21 Dec 2024 04:21:55 +0800 Subject: [PATCH] Fix elf: Move _dl_rtld_map, _dl_rtld_audit_state out of GL [BZ #32488] Also move _dl_rtld_map out of GL in sysdeps/x86_64/dl-cet.c. This fixes BZ #32488. Signed-off-by: H.J. Lu --- sysdeps/x86_64/dl-cet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/x86_64/dl-cet.c b/sysdeps/x86_64/dl-cet.c index 1297c09f84..e66c1a23b2 100644 --- a/sysdeps/x86_64/dl-cet.c +++ b/sysdeps/x86_64/dl-cet.c @@ -77,8 +77,8 @@ dl_check_legacy_object (struct link_map *m, /* Skip check for ld.so since it has the features enabled. The features will be disabled later if they are not enabled in executable. */ - if (l == &GL(dl_rtld_map) - || l->l_real == &GL(dl_rtld_map) + if (l == &_dl_rtld_map + || l->l_real == &_dl_rtld_map || (info->program != NULL && l == m)) continue; #endif -- 2.47.1