From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id AD6621F8C6 for ; Fri, 30 Jul 2021 19:56:28 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E7B183983046 for ; Fri, 30 Jul 2021 19:56:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7B183983046 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1627674987; bh=LUYDJlkCZkvP29jFdo+fBZ6yO1R5Kl9aYYuWE7Hij1E=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=m2XNUwR6x8fQyyLyzstyyTAfocYyfHe2WPCFwqYX2cm4CH+o43eGOFQ6TOQvn29F0 c1YvHHtCZoacnuWoFCvXbvrs1bgBwFpTw6Obnd2DuL/s6v056fCid3Qz+0DbRNvveq uix56ScFZjHwgtchbzpDzs9mar/wM0Q0KnJPKLBE= 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 1D6FC39730FF for ; Fri, 30 Jul 2021 19:47:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1D6FC39730FF Received: by mail-pl1-x633.google.com with SMTP id u16so3798492ple.2 for ; Fri, 30 Jul 2021 12:47:46 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LUYDJlkCZkvP29jFdo+fBZ6yO1R5Kl9aYYuWE7Hij1E=; b=liaCkQKoNjTuQTuERJQid/RMYzPEZ7i9Y1DioPTVS3W//hutIFQ4gSVuFTfmiWCmmB lVjJch7bbm2tGXjSn38qr4gVt6rvVZ/4b0IyplJ/6Yh3H4yrCudtFUIev05s0QMQxDpf 0E5iBgR7p3G3rCeyRWLHTAbA35XcGkeaIiWSYimhOFHzNlKvBJWu/EE2nxym87YpNVGJ a/yW6UrnwyioA9wxva0aMdoCkN/WRR7hl/KdgiY3f1rJ5afq5edatE1IJ3eGSjsTCeLc UFJ/+TpAkSDV98PZmx8C8bcKZVfktuepH0JWZAC4GTORsSQZZb4rjK2r4TU25RaPquBl 29dA== X-Gm-Message-State: AOAM531P0cHK6w1TBJm39Jj+QiNFbcKa6QAjpSvyuKG/PdxnJMCnjbrf To2Vyq4GvKTegm2iXraaL+PqMTrE845jFg== X-Google-Smtp-Source: ABdhPJwrZfEeSZPpjGrACZULvcx+nf7jRhLTw44sFPJtY3ILlySBKC48xSxhqMzGagGIBbwyK1om+g== X-Received: by 2002:a63:4b0a:: with SMTP id y10mr3667500pga.437.1627674465057; Fri, 30 Jul 2021 12:47:45 -0700 (PDT) Received: from birita.. ([2804:431:c7cb:43e2:6c33:fd81:e602:d33]) by smtp.gmail.com with ESMTPSA id c12sm3041426pfl.56.2021.07.30.12.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 12:47:44 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v3 11/20] elf: Add _dl_audit_preinit Date: Fri, 30 Jul 2021 16:47:06 -0300 Message-Id: <20210730194715.881900-12-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210730194715.881900-1-adhemerval.zanella@linaro.org> References: <20210730194715.881900-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Cc: John Mellor-Crummey Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" It consolidates the code required to call la_preinit() audit callback. No function change, checked on x86_64-linux-gnu. --- csu/libc-start.c | 23 +++-------------------- elf/Versions | 2 +- elf/dl-audit.c | 15 +++++++++++++++ sysdeps/generic/ldsodefs.h | 2 ++ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/csu/libc-start.c b/csu/libc-start.c index 0350b006fd..d01e57ea59 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -377,32 +377,15 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), /* This is a current program. Use the dynamic segment to find constructors. */ call_init (argc, argv, __environ); -#else /* !SHARED */ - call_init (argc, argv, __environ); -#endif /* SHARED */ -#ifdef SHARED /* Auditing checkpoint: we have a new object. */ - if (__glibc_unlikely (GLRO(dl_naudit) > 0)) - { - struct audit_ifaces *afct = GLRO(dl_audit); - struct link_map *head = GL(dl_ns)[LM_ID_BASE]._ns_loaded; - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - if (afct->preinit != NULL) - afct->preinit (&link_map_audit_state (head, cnt)->cookie); - - afct = afct->next; - } - } -#endif + _dl_audit_preinit (GL(dl_ns)[LM_ID_BASE]._ns_loaded); -#ifdef SHARED if (__glibc_unlikely (GLRO(dl_debug_mask) & DL_DEBUG_IMPCALLS)) GLRO(dl_debug_printf) ("\ntransferring control: %s\n\n", argv[0]); -#endif +#else /* !SHARED */ + call_init (argc, argv, __environ); -#ifndef SHARED _dl_debug_initialize (0, LM_ID_BASE); #endif diff --git a/elf/Versions b/elf/Versions index 25e91339b5..bfe1aec293 100644 --- a/elf/Versions +++ b/elf/Versions @@ -55,7 +55,7 @@ ld { _dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info; _dl_deallocate_tls; _dl_make_stack_executable; _dl_rtld_di_serinfo; _dl_starting_up; _dl_fatal_printf; - _dl_audit_symbind_alt; + _dl_audit_symbind_alt; _dl_audit_preinit; _rtld_global; _rtld_global_ro; # Only here for gdb while a better method is developed. diff --git a/elf/dl-audit.c b/elf/dl-audit.c index 8e4c65fdaf..a968cbde16 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -122,6 +122,21 @@ _dl_audit_objclose (struct link_map *l, Lmid_t nsid) } } +void +_dl_audit_preinit (struct link_map *l) +{ + if (__glibc_likely (GLRO(dl_naudit) < 0)) + return; + + struct audit_ifaces *afct = GLRO(dl_audit); + for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + { + if (afct->preinit != NULL) + afct->preinit (&link_map_audit_state (l, cnt)->cookie); + afct = afct->next; + } +} + void _dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, void **value, lookup_t result) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index f7db886fc0..4d39888a7b 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1376,6 +1376,8 @@ void _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result, LA_SYMB_DLSYM will be set before calling la_symbind() callback. */ void _dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, void **value, lookup_t result); +/* Call the la_preinit() from audit modules for the link_map L. */ +void _dl_audit_preinit (struct link_map *l); rtld_hidden_proto (_dl_audit_symbind_alt) #endif /* SHARED */ -- 2.30.2