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.133.124]) by sourceware.org (Postfix) with ESMTPS id E2FE23858412 for ; Mon, 24 Jan 2022 21:47:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E2FE23858412 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-328-z7rnsM2iOmuPk_Y2oiZ__g-1; Mon, 24 Jan 2022 16:47:11 -0500 X-MC-Unique: z7rnsM2iOmuPk_Y2oiZ__g-1 Received: by mail-il1-f198.google.com with SMTP id h6-20020a926c06000000b002b97ec9827fso7514752ilc.17 for ; Mon, 24 Jan 2022 13:47:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=7zMbS5++EiPme4Awpw+bTLTLsJwAB9mwTdOkevVBnXs=; b=ow+tvIAFS9ng0zuzuJHm64fcC90BksHklfhycEXVl4l47Avho0VePTXCLC2tM/LOtS CSPMewYN/WQK6NqnfFdUQJMiYjnlKxcvQoDYxOjtk2N+Ur/UrscHAXqWFMe/QfLhNLRu hcC2ddGmOOiNrlf/dR8275IBib0JWsmAKVzJoQ/gSdK8LAxzfMZXL9ZlvJtKWgt7oz55 lO8Rf2EZXAK7eL9FJwbtmzQzQ0d1VKXXooSDhDFv2wx7a1VbuXNuulsTgMQkOQ6T8H0X kiAoYPLdz8GjLE7OcYDtyY/FqowZkUpHB6O43cHzQXlF7uKEjOvp8zkz9LQ4UunCzx48 dd+A== X-Gm-Message-State: AOAM532o7oNz1KJigS/w4WyZ/0Q7O0MpWGen9cQIvBkQ1h9Y0AudP+yN ChcobTc9ja5XevTd+CVrlG4qSAu2KcZrvfPgl9QcxZKtTV7DVpD9R9LN9G4iSVmnUKLCJESiIcw Apm6bgdcOYPPeNO4+1A+e X-Received: by 2002:a05:6638:3052:: with SMTP id u18mr7936756jak.211.1643060830833; Mon, 24 Jan 2022 13:47:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAjN+9qENAP6Uy82MjMVUZwgnNXiXUpf2eP0FtQ6WU2XhzyV0QNeaalTQECoeNohJRQDv1rw== X-Received: by 2002:a05:6638:3052:: with SMTP id u18mr7936743jak.211.1643060830519; Mon, 24 Jan 2022 13:47:10 -0800 (PST) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id c9sm7804960ile.38.2022.01.24.13.47.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jan 2022 13:47:09 -0800 (PST) Message-ID: <9a2bd363-d48e-6e20-0bd2-a7e374c6e3cd@redhat.com> Date: Mon, 24 Jan 2022 16:47:08 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH v11 1/4] elf: Add la_activity during application exit To: Adhemerval Zanella , libc-alpha@sourceware.org, jma14 Cc: John Mellor-Crummey , Ben Woodard References: <20220124134618.992988-1-adhemerval.zanella@linaro.org> <20220124134618.992988-2-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20220124134618.992988-2-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, URIBL_BLACK 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-List-Received-Date: Mon, 24 Jan 2022 21:47:17 -0000 On 1/24/22 08:46, Adhemerval Zanella wrote: > la_activity is not called during application exit, even though > la_objclose is. This fails on my x86_64 tester. tst-audit23.c:150: numeric comparison failure left: 140392013825880 (0x7faf901d0758); from: cookie right: 18446744073709551615 (0xffffffffffffffff); from: last_act_cookie tst-audit23.c:150: numeric comparison failure left: 140392013825880 (0x7faf901d0758); from: cookie right: 18446744073709551615 (0xffffffffffffffff); from: last_act_cookie tst-audit23.c:150: numeric comparison failure left: 93825010503032 (0x5555566c0d78); from: cookie right: 18446744073709551615 (0xffffffffffffffff); from: last_act_cookie tst-audit23.c:145: numeric comparison failure left: 2 (0x2); from: acts[nacts] right: 140392013825880 (0x7faf901d0758); from: cookie tst-audit23.c:214: numeric comparison failure left: 2 (0x2); from: last_act_cookie right: 140392013825880 (0x7faf901d0758); from: cookie tst-audit23.c:132: numeric comparison failure left: 2 (0x2); from: last_act right: 0 (0x0); from: LA_ACT_CONSISTENT tst-audit23.c:150: numeric comparison failure left: 140392013825880 (0x7faf901d0758); from: cookie right: 2 (0x2); from: last_act_cookie error: 7 test failures Reproduces with: make test t=elf/tst-audit23 Tester is using: "--enable-hardcoded-path-in-tests" to exercise slightly different testing paths. > Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. > --- > elf/Makefile | 7 ++ > elf/dl-fini.c | 8 ++ > elf/tst-audit23.c | 239 +++++++++++++++++++++++++++++++++++++++++++ > elf/tst-audit23mod.c | 23 +++++ > elf/tst-auditmod23.c | 74 ++++++++++++++ > 5 files changed, 351 insertions(+) > create mode 100644 elf/tst-audit23.c > create mode 100644 elf/tst-audit23mod.c > create mode 100644 elf/tst-auditmod23.c > > diff --git a/elf/Makefile b/elf/Makefile > index c6c4710e16..d9cf72ae82 100644 > --- a/elf/Makefile > +++ b/elf/Makefile > @@ -375,6 +375,7 @@ tests += \ > tst-audit19b \ > tst-audit20 \ > tst-audit22 \ > + tst-audit23 \ > tst-auditmany \ > tst-auxobj \ > tst-auxobj-dlopen \ > @@ -658,6 +659,7 @@ modules-names = \ > tst-audit13mod1 \ > tst-audit18mod \ > tst-audit19bmod \ > + tst-audit23mod \ > tst-auditlogmod-1 \ > tst-auditlogmod-2 \ > tst-auditlogmod-3 \ > @@ -680,6 +682,7 @@ modules-names = \ > tst-auditmod19b \ > tst-auditmod20 \ > tst-auditmod22 \ > + tst-auditmod23 \ > tst-auxvalmod \ > tst-big-note-lib \ > tst-deep1mod1 \ > @@ -2113,6 +2116,10 @@ tst-audit20-ENV = LD_AUDIT=$(objpfx)tst-auditmod20.so > $(objpfx)tst-audit22.out: $(objpfx)tst-auditmod22.so > tst-audit22-ARGS = -- $(host-test-program-cmd) > > +$(objpfx)tst-audit23.out: $(objpfx)tst-auditmod23.so \ > + $(objpfx)tst-audit23mod.so > +tst-audit23-ARGS = -- $(host-test-program-cmd) > + > # tst-sonamemove links against an older implementation of the library. > LDFLAGS-tst-sonamemove-linkmod1.so = \ > -Wl,--version-script=tst-sonamemove-linkmod1.map \ > diff --git a/elf/dl-fini.c b/elf/dl-fini.c > index de8eb1b3c9..030b1fcbcd 100644 > --- a/elf/dl-fini.c > +++ b/elf/dl-fini.c > @@ -64,6 +64,10 @@ _dl_fini (void) > __rtld_lock_unlock_recursive (GL(dl_load_lock)); > else > { > +#ifdef SHARED > + _dl_audit_activity_nsid (ns, LA_ACT_DELETE); > +#endif > + > /* Now we can allocate an array to hold all the pointers and > copy the pointers in. */ > struct link_map *maps[nloaded]; > @@ -153,6 +157,10 @@ _dl_fini (void) > /* Correct the previous increment. */ > --l->l_direct_opencount; > } > + > +#ifdef SHARED > + _dl_audit_activity_nsid (ns, LA_ACT_CONSISTENT); > +#endif > } > } > > diff --git a/elf/tst-audit23.c b/elf/tst-audit23.c > new file mode 100644 > index 0000000000..c6393a31ff > --- /dev/null > +++ b/elf/tst-audit23.c > @@ -0,0 +1,239 @@ > +/* Check DT_AUDIT la_objopen and la_objclose for all objects. > + Copyright (C) 2022 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +static int restart; > +#define CMDLINE_OPTIONS \ > + { "restart", no_argument, &restart, 1 }, > + > +static int > +handle_restart (void) > +{ > + xdlopen ("tst-audit23mod.so", RTLD_NOW); > + xdlmopen (LM_ID_NEWLM, LIBC_SO, RTLD_NOW); > + > + return 0; > +} > + > +static inline bool > +startswith (const char *str, const char *pre) > +{ > + size_t lenpre = strlen (pre); > + size_t lenstr = strlen (str); > + return lenstr >= lenpre && memcmp (pre, str, lenpre) == 0; > +} > + > +static inline bool > +is_vdso (const char *str) > +{ > + return startswith (str, "linux-gate") > + || startswith (str, "linux-vdso"); > +} > + > +static int > +do_test (int argc, char *argv[]) > +{ > + /* We must have either: > + - One our fource parameters left if called initially: > + + path to ld.so optional > + + "--library-path" optional > + + the library path optional > + + the application name */ > + if (restart) > + return handle_restart (); > + > + char *spargv[9]; > + int i = 0; > + for (; i < argc - 1; i++) > + spargv[i] = argv[i + 1]; > + spargv[i++] = (char *) "--direct"; > + spargv[i++] = (char *) "--restart"; > + spargv[i] = NULL; > + TEST_VERIFY_EXIT (i < array_length (spargv)); > + > + setenv ("LD_AUDIT", "tst-auditmod23.so", 0); > + struct support_capture_subprocess result > + = support_capture_subprogram (spargv[0], spargv); > + support_capture_subprocess_check (&result, "tst-audit22", 0, sc_allow_stderr); > + > + /* The expected la_objopen/la_objclose: > + 1. executable > + 2. loader > + 3. libc.so > + 4. tst-audit23mod.so > + 5. libc.so (LM_ID_NEWLM). > + 6. vdso (optional and ignored). */ > + enum { max_objs = 6 }; > + struct la_obj_t > + { > + char *lname; > + uintptr_t laddr; > + Lmid_t lmid; > + bool closed; > + } objs[max_objs] = { [0 ... max_objs-1] = { .closed = false } }; > + size_t nobjs = 0; > + > + /* The expected namespaces are one for the audit module, one for the > + application, and another for the dlmopen on handle_restart. */ > + enum { max_ns = 3 }; > + uintptr_t acts[max_ns]; > + size_t nacts = 0; > + int last_act = -1; > + uintptr_t last_act_cookie = -1; > + bool seen_first_objclose = false; > + > + FILE *out = fmemopen (result.err.buffer, result.err.length, "r"); > + TEST_VERIFY (out != NULL); > + char *buffer = NULL; > + size_t buffer_length = 0; > + while (xgetline (&buffer, &buffer_length, out)) > + { > + if (startswith (buffer, "la_activity: ")) > + { > + uintptr_t cookie; > + int this_act; > + int r = sscanf (buffer, "la_activity: %d %"SCNxPTR"", &this_act, > + &cookie); > + TEST_COMPARE (r, 2); > + > + /* The cookie identifies the object at the head of the link map, > + so we only add a new namespace if it changes from previous > + one. This work since dlmopen is the last in the test body. */ > + if (cookie != last_act_cookie && last_act_cookie != -1) > + TEST_COMPARE (last_act, LA_ACT_CONSISTENT); > + > + if (this_act == LA_ACT_ADD && acts[nacts - 1] != cookie) > + { > + acts[nacts++] = cookie; > + last_act_cookie = cookie; > + } > + /* The LA_ACT_DELETE is called in the reverse order of LA_ACT_ADD > + at program termination (if the tests adds a dlclose or a library > + with extra dependencies this require to be adapted). */ > + else if (this_act == LA_ACT_DELETE) > + { > + last_act_cookie = acts[--nacts]; > + TEST_COMPARE (acts[nacts], cookie); > + acts[nacts] = 0; > + } > + else if (this_act == LA_ACT_CONSISTENT) > + { > + TEST_COMPARE (cookie, last_act_cookie); > + > + /* LA_ACT_DELETE must always be followed by an la_objclose. */ > + if (last_act == LA_ACT_DELETE) > + TEST_COMPARE (seen_first_objclose, true); > + else > + TEST_COMPARE (last_act, LA_ACT_ADD); > + } > + > + last_act = this_act; > + seen_first_objclose = false; > + } > + else if (startswith (buffer, "la_objopen: ")) > + { > + char *lname; > + uintptr_t laddr; > + Lmid_t lmid; > + uintptr_t cookie; > + int r = sscanf (buffer, "la_objopen: %"SCNxPTR" %ms %"SCNxPTR" %ld", > + &cookie, &lname, &laddr, &lmid); > + TEST_COMPARE (r, 4); > + > + /* la_objclose is not triggered by vDSO because glibc does not > + unload it. */ > + if (is_vdso (lname)) > + continue; > + if (nobjs == max_objs) > + FAIL_EXIT1 ("non expected la_objopen: %s %"PRIxPTR" %ld", > + lname, laddr, lmid); > + objs[nobjs].lname = lname; > + objs[nobjs].laddr = laddr; > + objs[nobjs].lmid = lmid; > + objs[nobjs].closed = false; > + nobjs++; > + > + /* This indirectly checks that la_objopen always come before > + la_objclose btween la_activity calls. */ > + seen_first_objclose = false; > + } > + else if (startswith (buffer, "la_objclose: ")) > + { > + char *lname; > + uintptr_t laddr; > + Lmid_t lmid; > + uintptr_t cookie; > + int r = sscanf (buffer, "la_objclose: %"SCNxPTR" %ms %"SCNxPTR" %ld", > + &cookie, &lname, &laddr, &lmid); > + TEST_COMPARE (r, 4); > + > + for (size_t i = 0; i < nobjs; i++) > + { > + if (strcmp (lname, objs[i].lname) == 0 && lmid == objs[i].lmid) > + { > + TEST_COMPARE (objs[i].closed, false); > + objs[i].closed = true; > + break; > + } > + } > + > + /* la_objclose should be called after la_activity(LA_ACT_DELETE) for > + the closed object's namespace. */ > + TEST_COMPARE (last_act, LA_ACT_DELETE); > + if (!seen_first_objclose) > + { > + TEST_COMPARE (last_act_cookie, cookie); > + seen_first_objclose = true; > + } > + } > + } > + > + for (size_t i = 0; i < nobjs; i++) > + { > + TEST_COMPARE (objs[i].closed, true); > + free (objs[i].lname); > + } > + > + /* la_activity(LA_ACT_CONSISTENT) should be the last callback received. > + Since only one link map may be not-CONSISTENT at a time, this also > + ensures la_activity(LA_ACT_CONSISTENT) is the last callback received > + for every namespace. */ > + TEST_COMPARE (last_act, LA_ACT_CONSISTENT); > + > + free (buffer); > + xfclose (out); > + > + return 0; > +} > + > +#define TEST_FUNCTION_ARGV do_test > +#include > diff --git a/elf/tst-audit23mod.c b/elf/tst-audit23mod.c > new file mode 100644 > index 0000000000..9a116ff682 > --- /dev/null > +++ b/elf/tst-audit23mod.c > @@ -0,0 +1,23 @@ > +/* Extra modules for tst-audit23 > + Copyright (C) 2022 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +int > +foo (void) > +{ > + return 0; > +} > diff --git a/elf/tst-auditmod23.c b/elf/tst-auditmod23.c > new file mode 100644 > index 0000000000..42eccae11b > --- /dev/null > +++ b/elf/tst-auditmod23.c > @@ -0,0 +1,74 @@ > +/* Audit modules loaded by tst-audit23. > + Copyright (C) 2022 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +unsigned int > +la_version (unsigned int version) > +{ > + return LAV_CURRENT; > +} > + > +struct map_desc_t > +{ > + char *lname; > + uintptr_t laddr; > + Lmid_t lmid; > +}; > + > +void > +la_activity (uintptr_t *cookie, unsigned int flag) > +{ > + fprintf (stderr, "%s: %d %"PRIxPTR"\n", __func__, flag, (uintptr_t) cookie); > +} > + > +unsigned int > +la_objopen (struct link_map *map, Lmid_t lmid, uintptr_t *cookie) > +{ > + const char *l_name = map->l_name[0] == '\0' ? "mainapp" : map->l_name; > + fprintf (stderr, "%s: %"PRIxPTR" %s %"PRIxPTR" %ld\n", __func__, > + (uintptr_t) cookie, l_name, map->l_addr, lmid); > + > + struct map_desc_t *map_desc = malloc (sizeof (struct map_desc_t)); > + if (map_desc == NULL) > + abort (); > + > + map_desc->lname = strdup (l_name); > + map_desc->laddr = map->l_addr; > + map_desc->lmid = lmid; > + > + *cookie = (uintptr_t) map_desc; > + > + return 0; > +} > + > +unsigned int > +la_objclose (uintptr_t *cookie) > +{ > + struct map_desc_t *map_desc = (struct map_desc_t *) *cookie; > + fprintf (stderr, "%s: %"PRIxPTR" %s %"PRIxPTR" %ld\n", __func__, > + (uintptr_t) cookie, map_desc->lname, map_desc->laddr, > + map_desc->lmid); > + > + return 0; > +} -- Cheers, Carlos.