From patchwork Wed Dec 22 13:27:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 49183 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 97C4A385841D for ; Wed, 22 Dec 2021 13:31:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 97C4A385841D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640179917; bh=Lv102sjfzmmbNFTuo1nQk65Tq7ZTD7PyAedIULJk8SQ=; 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=ASIDc0ybqthhK/jzCJ/vFdxB+sZw8rEb9OyraH5SlKaTbbeRfwAgSP+g2n8a7eAw5 0Qlp/DrTgSAGIKs1A7Pmrr+qpNdAj8HPNBEfLHjMQn3Xbpt/2HJHaBJpY9xLaNojrM tNy8rY3PXw+App6UQ6xWotHUWDenhuKV7Q1h9VAc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) by sourceware.org (Postfix) with ESMTPS id BD9FA385842B for ; Wed, 22 Dec 2021 13:27:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BD9FA385842B Received: by mail-qk1-x72a.google.com with SMTP id m186so2258214qkb.4 for ; Wed, 22 Dec 2021 05:27:27 -0800 (PST) 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=Lv102sjfzmmbNFTuo1nQk65Tq7ZTD7PyAedIULJk8SQ=; b=KhaKgoylS01LnBgJ1o1A12vx+ovUz+b3OjUf6josOMupOf+kmPwqCkJFqG9Yp3XOrW T8OMmTX+lfZeKtXcHWdrYqK1Rn1hkSu4kPTMRb0hKhdoygar0MjM2HpXFSPSd1dYhv6J Muz0N5k8VqfGcC2U/8RGupPkJH+o6VlPFPTOaDDgIwqMsqdX3nnQIf8dKVL2TI3NWfhN y0gK7pTi+7CD9RrYqWm0lwPvTd4+DqIOdd5mP1c8Dj/7a+3QmBSu5xHDXGQt+D65edqK 6xAgT1GqX59bYn195ZDHN+nUQKyiBZXH6sR1hX6qI271FRJ95ant7l9v3g/KWJP5affT riww== X-Gm-Message-State: AOAM532NwmN2/qlfFeWFC6FXsEuLeb4qRlS/JV+etL4+esOeGJxpGz6j af8TGPG1aTb5XLvqsu6sRWeJWT/ikpyFWQ== X-Google-Smtp-Source: ABdhPJwbJUEWF4Bha5dx+uytDHedQxKhqzlUMSNayffuJY5JnEYn26ZcNb1+aUvB/1YjZtMcDcj17Q== X-Received: by 2002:a05:620a:280d:: with SMTP id f13mr1910378qkp.686.1640179647241; Wed, 22 Dec 2021 05:27:27 -0800 (PST) Received: from birita.. ([2804:431:c7cb:3b1e:1ba8:c11f:6224:efe1]) by smtp.gmail.com with ESMTPSA id x13sm1942849qkp.102.2021.12.22.05.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 05:27:27 -0800 (PST) To: libc-alpha@sourceware.org, fweimer@redhat.com Subject: [PATCH v7 06/16] elf: Add _dl_audit_preinit Date: Wed, 22 Dec 2021 10:27:02 -0300 Message-Id: <20211222132712.523295-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211222132712.523295-1-adhemerval.zanella@linaro.org> References: <20211222132712.523295-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 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. Reviewed-by: Florian Weimer Reviewed-by: Florian Weimer --- csu/libc-start.c | 23 +++-------------------- elf/Versions | 2 +- elf/dl-audit.c | 15 +++++++++++++++ sysdeps/generic/ldsodefs.h | 3 +++ 4 files changed, 22 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 3c1a230af8..d814ed3154 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -112,6 +112,21 @@ _dl_audit_objclose (struct link_map *l) } } +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 d312c4c97b..11b1563e66 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1422,6 +1422,9 @@ void _dl_audit_objopen (struct link_map *l, Lmid_t nsid) void _dl_audit_objclose (struct link_map *l) attribute_hidden; +/* Call the la_preinit from the audit modules for the link_map L. */ +void _dl_audit_preinit (struct link_map *l); + /* Call the la_symbind{32,64} from the audit modules for the 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,