From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DE17B385801E for ; Tue, 12 Apr 2022 18:42:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DE17B385801E Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-449-kZHQF-ncMjycj_aUStTcIQ-1; Tue, 12 Apr 2022 14:42:32 -0400 X-MC-Unique: kZHQF-ncMjycj_aUStTcIQ-1 Received: by mail-qv1-f69.google.com with SMTP id jx11-20020a0562142b0b00b0044444479dcbso5969117qvb.9 for ; Tue, 12 Apr 2022 11:42:32 -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=aBL+gVE6gChNsx+gTV8Tsw+umQq9WLZ48yamueVvB0w=; b=AtCdCwKfZ6iZRVc7oKpO5wr+bhZZHhzz+FMLXqFiUhsFrQJuOpWHeQPBrmW9xOLo+j t2qPcWf5cZ61eoRWRMjlyo+JtlLqLvS8tG9goc/SGGkPPO/0Pcw9b+c9iOFbv1b0x8gQ FBPJ4XJWd/ICZo9/92wJQjS2BtwcpdoNwK8O6ldjsRRsk2PQWfhYFipogh4tYzvbQtRp h8qTI9C6gTHGb80Ag6sjFXOHexbGLHhMIveEycokAUmvEMn78d7MxvEKfLlflGpnSSHB GxhQVFhjAFpw/Vu+bPZCNTUJAOWVv4arWT5edUDgzPZWjWR4olrHJ9FrMbTAIk9vutni R5Vg== X-Gm-Message-State: AOAM530L3Y1WtJuqiTycd96qk/O84UTOdKH5M3tb3/jswpcIf1o4euS7 FsBSAbFUjA2OKieNWBDM7HkQYOI/gHPMDRb62aUU4OidoRysD94SQmt3bF4xRY6PtXAcVhvCckq PtYg6E6SlBQ+P19CJU2cPFIUkWLPlxy2z0GBBFKJsTquazA3pm/0+7NpWuW29wXxlEZxTQ+o= X-Received: by 2002:a05:6214:c84:b0:441:40b6:2cbb with SMTP id r4-20020a0562140c8400b0044140b62cbbmr32812391qvr.62.1649788951631; Tue, 12 Apr 2022 11:42:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9lKS15e0jDZ8g3AkEUdYU5gPt5wqx9PXf48TbnTfwo0WHzXPQN53ExFk5V27xHmbMiYHF7g== X-Received: by 2002:a05:6214:c84:b0:441:40b6:2cbb with SMTP id r4-20020a0562140c8400b0044140b62cbbmr32812362qvr.62.1649788951215; Tue, 12 Apr 2022 11:42:31 -0700 (PDT) Received: from athas.redhat.com (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id j19-20020a05622a039300b002ecc2ebfd87sm10953840qtx.32.2022.04.12.11.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:42:30 -0700 (PDT) From: Carlos O'Donell To: libc-stable@sourceware.org Cc: Adhemerval Zanella , Florian Weimer Subject: [PATCH 12/27] elf: Add _dl_audit_symbind_alt and _dl_audit_symbind Date: Tue, 12 Apr 2022 14:41:50 -0400 Message-Id: <20220412184205.3343677-13-carlos@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412184205.3343677-1-carlos@redhat.com> References: <20220412184205.3343677-1-carlos@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: application/octet-stream; x-default=true X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TVD_SPACE_RATIO, 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2022 18:42:34 -0000 From: Adhemerval Zanella It consolidates the code required to call la_symbind{32,64} audit callback. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer (cherry picked from commit cda4f265c65fb6c4ce38ca1cf0a7e527c5e77cd5) --- elf/Versions | 1 + elf/dl-audit.c | 122 +++++++++++++++++++++++++++++++++++++ elf/dl-runtime.c | 79 +----------------------- elf/dl-sym-post.h | 47 +------------- sysdeps/generic/ldsodefs.h | 10 +++ 5 files changed, 135 insertions(+), 124 deletions(-) diff --git a/elf/Versions b/elf/Versions index 2af210b8f7..164682eaea 100644 --- a/elf/Versions +++ b/elf/Versions @@ -58,6 +58,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; _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 cb1c3de93c..a21530f30b 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include #include void @@ -106,3 +107,124 @@ _dl_audit_objclose (struct link_map *l) afct = afct->next; } } + +void +_dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, void **value, + lookup_t result) +{ + if ((l->l_audit_any_plt | result->l_audit_any_plt) == 0) + return; + + const char *strtab = (const char *) D_PTR (result, l_info[DT_STRTAB]); + /* Compute index of the symbol entry in the symbol table of the DSO with + the definition. */ + unsigned int ndx = (ref - (ElfW(Sym) *) D_PTR (result, l_info[DT_SYMTAB])); + + unsigned int altvalue = 0; + /* Synthesize a symbol record where the st_value field is the result. */ + ElfW(Sym) sym = *ref; + sym.st_value = (ElfW(Addr)) *value; + + struct audit_ifaces *afct = GLRO(dl_audit); + for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + { + struct auditstate *match_audit = link_map_audit_state (l, cnt); + struct auditstate *result_audit = link_map_audit_state (result, cnt); + if (afct->symbind != NULL + && ((match_audit->bindflags & LA_FLG_BINDFROM) != 0 + || ((result_audit->bindflags & LA_FLG_BINDTO) + != 0))) + { + unsigned int flags = altvalue | LA_SYMB_DLSYM; + uintptr_t new_value = afct->symbind (&sym, ndx, + &match_audit->cookie, + &result_audit->cookie, + &flags, strtab + ref->st_name); + if (new_value != (uintptr_t) sym.st_value) + { + altvalue = LA_SYMB_ALTVALUE; + sym.st_value = new_value; + } + + afct = afct->next; + } + + *value = (void *) sym.st_value; + } +} +rtld_hidden_def (_dl_audit_symbind_alt) + +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) +{ + reloc_result->bound = result; + /* Compute index of the symbol entry in the symbol table of the DSO with the + definition. */ + reloc_result->boundndx = (defsym - (ElfW(Sym) *) D_PTR (result, + l_info[DT_SYMTAB])); + + if ((l->l_audit_any_plt | result->l_audit_any_plt) == 0) + { + /* Set all bits since this symbol binding is not interesting. */ + reloc_result->enterexit = (1u << DL_NNS) - 1; + return; + } + + /* Synthesize a symbol record where the st_value field is the result. */ + ElfW(Sym) sym = *defsym; + sym.st_value = DL_FIXUP_VALUE_ADDR (*value); + + /* Keep track whether there is any interest in tracing the call in the lower + two bits. */ + assert (DL_NNS * 2 <= sizeof (reloc_result->flags) * 8); + assert ((LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT) == 3); + reloc_result->enterexit = LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT; + + const char *strtab2 = (const void *) D_PTR (result, l_info[DT_STRTAB]); + + unsigned int flags = 0; + struct audit_ifaces *afct = GLRO(dl_audit); + for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) + { + /* XXX Check whether both DSOs must request action or only one */ + struct auditstate *l_state = link_map_audit_state (l, cnt); + struct auditstate *result_state = link_map_audit_state (result, cnt); + if ((l_state->bindflags & LA_FLG_BINDFROM) != 0 + && (result_state->bindflags & LA_FLG_BINDTO) != 0) + { + if (afct->symbind != NULL) + { + uintptr_t new_value = afct->symbind (&sym, + reloc_result->boundndx, + &l_state->cookie, + &result_state->cookie, + &flags, + strtab2 + defsym->st_name); + if (new_value != (uintptr_t) sym.st_value) + { + flags |= LA_SYMB_ALTVALUE; + sym.st_value = new_value; + } + } + + /* Remember the results for every audit library and store a summary + in the first two bits. */ + reloc_result->enterexit &= flags & (LA_SYMB_NOPLTENTER + | LA_SYMB_NOPLTEXIT); + reloc_result->enterexit |= ((flags & (LA_SYMB_NOPLTENTER + | LA_SYMB_NOPLTEXIT)) + << ((cnt + 1) * 2)); + } + else + /* If the bind flags say this auditor is not interested, set the bits + manually. */ + reloc_result->enterexit |= ((LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT) + << ((cnt + 1) * 2)); + afct = afct->next; + } + + reloc_result->flags = flags; + *value = DL_FIXUP_ADDR_VALUE (sym.st_value); +} diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index 61c260ddb8..c4413c9165 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -297,84 +297,7 @@ _dl_profile_fixup ( auditing libraries the possibility to change the value and tell us whether further auditing is wanted. */ if (defsym != NULL && GLRO(dl_naudit) > 0) - { - reloc_result->bound = result; - /* Compute index of the symbol entry in the symbol table of - the DSO with the definition. */ - reloc_result->boundndx = (defsym - - (ElfW(Sym) *) D_PTR (result, - l_info[DT_SYMTAB])); - - /* Determine whether any of the two participating DSOs is - interested in auditing. */ - if ((l->l_audit_any_plt | result->l_audit_any_plt) != 0) - { - unsigned int flags = 0; - struct audit_ifaces *afct = GLRO(dl_audit); - /* Synthesize a symbol record where the st_value field is - the result. */ - ElfW(Sym) sym = *defsym; - sym.st_value = DL_FIXUP_VALUE_ADDR (value); - - /* Keep track whether there is any interest in tracing - the call in the lower two bits. */ - assert (DL_NNS * 2 <= sizeof (reloc_result->flags) * 8); - assert ((LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT) == 3); - reloc_result->enterexit = LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT; - - const char *strtab2 = (const void *) D_PTR (result, - l_info[DT_STRTAB]); - - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - /* XXX Check whether both DSOs must request action or - only one */ - struct auditstate *l_state = link_map_audit_state (l, cnt); - struct auditstate *result_state - = link_map_audit_state (result, cnt); - if ((l_state->bindflags & LA_FLG_BINDFROM) != 0 - && (result_state->bindflags & LA_FLG_BINDTO) != 0) - { - if (afct->symbind != NULL) - { - uintptr_t new_value - = afct->symbind (&sym, reloc_result->boundndx, - &l_state->cookie, - &result_state->cookie, - &flags, - strtab2 + defsym->st_name); - if (new_value != (uintptr_t) sym.st_value) - { - flags |= LA_SYMB_ALTVALUE; - sym.st_value = new_value; - } - } - - /* Remember the results for every audit library and - store a summary in the first two bits. */ - reloc_result->enterexit - &= flags & (LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT); - reloc_result->enterexit - |= ((flags & (LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT)) - << ((cnt + 1) * 2)); - } - else - /* If the bind flags say this auditor is not interested, - set the bits manually. */ - reloc_result->enterexit - |= ((LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT) - << ((cnt + 1) * 2)); - - afct = afct->next; - } - - reloc_result->flags = flags; - value = DL_FIXUP_ADDR_VALUE (sym.st_value); - } - else - /* Set all bits since this symbol binding is not interesting. */ - reloc_result->enterexit = (1u << DL_NNS) - 1; - } + _dl_audit_symbind (l, reloc_result, defsym, &value, result); #endif /* Store the result for later runs. */ diff --git a/elf/dl-sym-post.h b/elf/dl-sym-post.h index d68c2d2b1c..a11095d3e8 100644 --- a/elf/dl-sym-post.h +++ b/elf/dl-sym-post.h @@ -52,54 +52,9 @@ _dl_sym_post (lookup_t result, const ElfW(Sym) *ref, void *value, tell us whether further auditing is wanted. */ if (__glibc_unlikely (GLRO(dl_naudit) > 0)) { - const char *strtab = (const char *) D_PTR (result, - l_info[DT_STRTAB]); - /* Compute index of the symbol entry in the symbol table of - the DSO with the definition. */ - unsigned int ndx = (ref - (ElfW(Sym) *) D_PTR (result, - l_info[DT_SYMTAB])); - if (match == NULL) match = _dl_sym_find_caller_link_map (caller); - - if ((match->l_audit_any_plt | result->l_audit_any_plt) != 0) - { - unsigned int altvalue = 0; - struct audit_ifaces *afct = GLRO(dl_audit); - /* Synthesize a symbol record where the st_value field is - the result. */ - ElfW(Sym) sym = *ref; - sym.st_value = (ElfW(Addr)) value; - - for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt) - { - struct auditstate *match_audit - = link_map_audit_state (match, cnt); - struct auditstate *result_audit - = link_map_audit_state (result, cnt); - if (afct->symbind != NULL - && ((match_audit->bindflags & LA_FLG_BINDFROM) != 0 - || ((result_audit->bindflags & LA_FLG_BINDTO) - != 0))) - { - unsigned int flags = altvalue | LA_SYMB_DLSYM; - uintptr_t new_value - = afct->symbind (&sym, ndx, - &match_audit->cookie, - &result_audit->cookie, - &flags, strtab + ref->st_name); - if (new_value != (uintptr_t) sym.st_value) - { - altvalue = LA_SYMB_ALTVALUE; - sym.st_value = new_value; - } - } - - afct = afct->next; - } - - value = (void *) sym.st_value; - } + _dl_audit_symbind_alt (match, ref, &value, result); } #endif return value; diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index ee77c1a2a6..be5f3d16ca 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1386,6 +1386,16 @@ void _dl_audit_objopen (struct link_map *l, Lmid_t nsid) /* Call the la_objclose from the audit modules for the link_map L. */ void _dl_audit_objclose (struct link_map *l) attribute_hidden; + +/* 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, + lookup_t result) + attribute_hidden; +/* Same as _dl_audit_symbind, but also sets LA_SYMB_DLSYM flag. */ +void _dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, + void **value, lookup_t result); +rtld_hidden_proto (_dl_audit_symbind_alt) #endif /* SHARED */ #if PTHREAD_IN_LIBC && defined SHARED -- 2.35.1