From patchwork Fri Dec 20 20:39:34 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: 103537 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 3083D3858D26 for ; Fri, 20 Dec 2024 20:40:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3083D3858D26 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=aM/Bbyn8 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-yb1-xb30.google.com (mail-yb1-xb30.google.com [IPv6:2607:f8b0:4864:20::b30]) by sourceware.org (Postfix) with ESMTPS id 1B11A3858D26 for ; Fri, 20 Dec 2024 20:40:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B11A3858D26 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 1B11A3858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b30 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734727212; cv=none; b=IxuVOzd/A+IQsYWbCadeimy+zKotL2t4+4rJGbMvQttNU1DD+Yeb6M+m0R7FjHB97pqqugHnV0/ZdTKvSYOcPs6fDLC/RH7Sg1aAWrIltg7+dOGTCgx44GmBDy74PXCeeYq+EeZSNFTdLTQwN8dXXMETori1RpZecz5SjR4G4LE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734727212; c=relaxed/simple; bh=xhTfTbvwTAAKzscIqMDTdBi6XmxsczoZ38srbuEdVJ0=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=VXNi+jWY8MtQ/5FdNKU62+1RXFoq9EYDhcp/QW7PtycLAixkWtEkYdItQa2dnxvJ8ADo4um28TFX46VqUql8/A/gUVzCyTp3ZTHfNmaPy16i3NYoaF3iw0ii34Ki78TscmcGa3yQcyY62OqIUE/H7JepgY3c+v8VlCZknOfkmB8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B11A3858D26 Received: by mail-yb1-xb30.google.com with SMTP id 3f1490d57ef6-e3a0acba5feso1659252276.2 for ; Fri, 20 Dec 2024 12:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734727211; x=1735332011; 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=9JiZDl41NwgS97IA3kgU5XbMKg5PKKqkDAr6Ve/bDxc=; b=aM/Bbyn8D69xvFD34YhpFJpum5iFg2eM9q3z3vXuYPuZg0S/aHemC/bs5Iv7T9yD1t VUlKXRJXU91flxvASzbQvu1jAEwJT+uevgLu9xxWl0UOcpD8j2S8hKVzWkyzSKDAH5vi dZ4ezTtp0ZfUwiHJmpRxJScApZI0bWjnCQrVDjC/Ai+UZWPh4pOkLarNhkq/GC0AonNR csvv8QtLba6ZUBANoDTgK5BAmPfZZnvQGS/veQ9l5D2vJvvhTtBHTPdRd13rlJUOjVyj doU7RjpzY343prtuvsD9rFcfSIxfvdth3NKgsKKdk9Yg/WsbWyN/b4rqNXPRE9GHAnBc y8MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734727211; x=1735332011; 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=9JiZDl41NwgS97IA3kgU5XbMKg5PKKqkDAr6Ve/bDxc=; b=Vxvvb2hRQ5E83f9PFRik3QJAms70gzBZcjFWG5kGLG88AZTfIWpWxfKv/wZt92MpGh 9+2kG66CDblTm/OrnvcN9rgDFHAsI2rJDXiVRnRH/X9OPkF09Jy4XFRsmB4FBilz3wf+ rJwK7jvLYEebEqXgU2mSIS+3sImm+c7EUP0U9Ubkl+xLwb3PQHapefXVenVJw2VsQJ7r gq/KFAmSm6pMAY4H/RWzP2ntxSdW3UEv5EjEcwwzIc7Au/gz2RwC7n4O9dgH0TcBSeMt KLrnqup5qgfJI814xLpUjAbVCWJ9eZRMXPtj/PHx5L0ny5r/pRPN8DBieWZLBETxgTEc T8Mg== X-Forwarded-Encrypted: i=1; AJvYcCWS5KfsTBSFa4HT6utWf/PQSRUeJ72xaVBco14r7sQKgRshG+WeI+tuCoN4PWyzAC40CP2LrCL142a1@sourceware.org X-Gm-Message-State: AOJu0YxynoCP6oa2F6QSheqCSucfm8z8rnRqbt1PQGHz3yZMuEBZ35kV bm4oCxryAHWFBfohXxT+WrD3LNNOIXfeUfTxZThpTja9+iOhk8KkgYQZSzGso3dhYKjyVVbrTUr jGriH6CL2a9DnSBxFmHjfyj++qp0= X-Gm-Gg: ASbGnctEmVMBDlRX4j0jAofF18K2taKTxd+l8ONkh6lru6rTW1frpxYAuloE2pT5OU4 Ckat/9GKP7RIeYnVRrvs7vFiCkbqXhC7C9wPeAg== X-Google-Smtp-Source: AGHT+IGdTOW12pUjOPh3DBQOQt6OqYrgXjigFO4a5xtF9kO7YvtfRQDmuw5zf6SuOpG7Mfy52Hq9hK0y6WjXE05yHWk= X-Received: by 2002:a05:6902:15ca:b0:e47:f4e3:87ff with SMTP id 3f1490d57ef6-e538c1e256emr3407567276.7.1734727211222; Fri, 20 Dec 2024 12:40:11 -0800 (PST) MIME-Version: 1.0 References: <7e131f53a6289b35ba3eef5fe7f54f5b925b65c6.1734439824.git.fweimer@redhat.com> <0a55b8dd9cac2cb002cf00caad7000dc5080702f.1734439824.git.fweimer@redhat.com> <87seqip058.fsf@oldenburg.str.redhat.com> In-Reply-To: <87seqip058.fsf@oldenburg.str.redhat.com> From: "H.J. Lu" Date: Sat, 21 Dec 2024 04:39:34 +0800 Message-ID: Subject: [PATCH v2] Fix elf: Introduce is_rtld_link_map [BZ #32488] To: Florian Weimer Cc: Adhemerval Zanella Netto , GNU C Library X-Spam-Status: No, score=-3016.3 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 Sat, Dec 21, 2024 at 4:31 AM Florian Weimer wrote: > > * H. J. Lu: > > > 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 > > Please use is_rtld_link_map. It's not an important difference here > because the condition is under SHARED, but it helps with transitioning > to RELRO link maps. > Done. I am testing this and will check it in after testing. Also use is_rtld_link_map in dl-cet.c. This fixes BZ #32488. From 40bf25b75418a7fa22ffc22dc321465ae7061cd2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 21 Dec 2024 04:21:55 +0800 Subject: [PATCH] Fix elf: Introduce is_rtld_link_map [BZ #32488] Also use is_rtld_link_map in 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..7cde5ee0dc 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 (is_rtld_link_map (l) + || is_rtld_link_map (l->l_real) || (info->program != NULL && l == m)) continue; #endif -- 2.47.1