From patchwork Thu Oct 14 17:47:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 46234 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 161083857C53 for ; Thu, 14 Oct 2021 17:56:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 161083857C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1634234184; bh=2mMzl8cveNRt16sLgjf6CKM0djukTHmlXDgrcj18w+4=; 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=tOroKE0eg/3QoDa4Tv6Yo+BWs2jj16JVAZhIeWa/DD0J2fxjTWcnjTu7dBb+DjaPQ Gehj+lBrgEWOxqHMbPVkTbdyGWEoZ9syypUEK4tq/Cvm8ZvOq5m1+OUayurZWTuiLK R4yvNBN52edWdL+0euIvhRT3XA5rR5d+IXByHZcs= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-vk1-xa2b.google.com (mail-vk1-xa2b.google.com [IPv6:2607:f8b0:4864:20::a2b]) by sourceware.org (Postfix) with ESMTPS id 4BDA0385800B for ; Thu, 14 Oct 2021 17:48:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4BDA0385800B Received: by mail-vk1-xa2b.google.com with SMTP id l20so1127079vkm.8 for ; Thu, 14 Oct 2021 10:48:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2mMzl8cveNRt16sLgjf6CKM0djukTHmlXDgrcj18w+4=; b=kCJCawgqKwfnzw47OxFsceuC0e4h7WkN1eQjjzQYIG8eiPxWa9mIuZ5YluLTTSe3Uf 4K75c6rVjpP8OPVObgP/D7YWl+MMQIdmI0a9Izcp8GdQVuRIhe1wXVb3vtx+XFh2Ql9z KUqawhZQCA/LtLZhjEEgAwYs8eRRRymq77C00W0Ea7plDEIL3dDvbBCfWb2cJMA5fpi0 Y8lGHhUQXwDjt/bvOezdDK/6I4OJc0Cjp1hx2r3CkkrkuEpgvjGWW5xAf53k5dPBsy01 6YA34HlC8hQnG44XltYo+AnHoZ3tsnSVNdMivYKC4QZe0xVsLV5psl28hqH36IcDbAtL MT0g== X-Gm-Message-State: AOAM533Yi87GP1CpLuZ784c8L19t/vuiD+5G8JLUj2NNqf3Buj7FWJMA UHYnzG/ElcbwiROTBzwkEyZ9bHbd7giibA== X-Google-Smtp-Source: ABdhPJyOLAKeDa4st4eISGVPi+Kou7dFYth7H+d8/MMGrws2xNjyLNzt5HFTuUCjfhPknNyFLqPhUQ== X-Received: by 2002:a1f:a00e:: with SMTP id j14mr7798987vke.20.1634233695772; Thu, 14 Oct 2021 10:48:15 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:c6c7:3c65:db0e:6fcc:a8e9]) by smtp.gmail.com with ESMTPSA id q26sm2107237vkn.40.2021.10.14.10.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 10:48:15 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v4 11/21] elf: Add _dl_audit_preinit Date: Thu, 14 Oct 2021 14:47:42 -0300 Message-Id: <20211014174752.1651347-12-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211014174752.1651347-1-adhemerval.zanella@linaro.org> References: <20211014174752.1651347-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: John Mellor-Crummey Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It consolidates the code required to call la_preinit() audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. --- csu/libc-start.c | 23 +++-------------------- elf/Versions | 2 +- elf/dl-audit.c | 15 +++++++++++++++ sysdeps/generic/ldsodefs.h | 1 + 4 files changed, 20 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 8cca508080..c69c54200f 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1375,6 +1375,7 @@ void _dl_audit_activity_nsid (Lmid_t nsid, int action); if main mapping of the namespace is a audit modules. */ void _dl_audit_objopen (struct link_map *l, Lmid_t nsid, bool check_audit); void _dl_audit_objclose (struct link_map *l, Lmid_t nsid); +void _dl_audit_preinit (struct link_map *l); void _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result, const ElfW(Sym) *defsym, DL_FIXUP_VALUE_TYPE *value, lookup_t result);