public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Stefan Liebler <stli@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] S390: Fix elf/tst-audit25[ab]
Date: Thu,  7 Apr 2022 18:38:44 +0000 (GMT)	[thread overview]
Message-ID: <20220407183844.0BB223857C42@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5325233313c66aea13e86f5dd59618e9dd74b510

commit 5325233313c66aea13e86f5dd59618e9dd74b510
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Thu Apr 7 13:59:48 2022 +0200

    S390: Fix elf/tst-audit25[ab]
    
    If glibc is configured with --disable-default-pie and build on
    s390 with -O3, the tests elf/tst-audit25a and elf/tst-audit25b are
    failing as there are additional la_symbind lines for free and malloc.
    It turns out that those belong to the executable. In fact those are
    the PLT-stubs. Furthermore la_symbind is also called for calloc and
    realloc symbols, but those belong to libc.
    
    Those functions are not called at all, but dlsym'ed in
    elf/dl-minimal.c:
    __rtld_malloc_init_real (struct link_map *main_map)
    {
    ...
      void *new_calloc = lookup_malloc_symbol (main_map, "calloc", &version);
      void *new_free = lookup_malloc_symbol (main_map, "free", &version);
      void *new_malloc = lookup_malloc_symbol (main_map, "malloc", &version);
      void *new_realloc = lookup_malloc_symbol (main_map, "realloc", &version);
    ...
    }
    
    Therefore, this commit just ignored symbols with LA_SYMB_DLSYM flag.
    Reviewed-by: Adheemrval Zanella  <adhemerval.zanella@linaro.org>

Diff:
---
 elf/tst-auditmod25.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/elf/tst-auditmod25.c b/elf/tst-auditmod25.c
index 20640a8daf..0524c5aab1 100644
--- a/elf/tst-auditmod25.c
+++ b/elf/tst-auditmod25.c
@@ -72,7 +72,8 @@ la_symbind32 (Elf32_Sym *sym, unsigned int ndx,
 	      unsigned int *flags, const char *symname)
 #endif
 {
-  if (*refcook != -1 && *defcook != -1 && symname[0] != '\0')
+  if (*refcook != -1 && *defcook != -1 && symname[0] != '\0'
+      && (*flags & LA_SYMB_DLSYM) == 0)
     fprintf (stderr, "la_symbind: %s %u\n", symname,
 	     *flags & (LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT) ? 1 : 0);
   return sym->st_value;


                 reply	other threads:[~2022-04-07 18:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220407183844.0BB223857C42@sourceware.org \
    --to=stli@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).