From patchwork Mon Nov 15 18:37:26 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: 47709 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 A94BA3857C44 for ; Mon, 15 Nov 2021 18:47:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A94BA3857C44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637002041; bh=hf5tARBz92ZEm/vZl4Y0l0cz8TzjGknh/Ho8cz7Ryxg=; 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=V/d806Shq2hQcGiirx7izNyqSg9dWJxiNG8uUkyH/dh0kjGQcphm3u2xbz84mWKwb 3wGf+mus9tT2wlZpMp5c3ObJK05NPfwcWTfnrRi2AbHHhsRDcvl/AuienAK5CWOMx4 MjU26RSjC83BUuxh+mTqiz/Al9EUBe3BHIYa9LPo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x935.google.com (mail-ua1-x935.google.com [IPv6:2607:f8b0:4864:20::935]) by sourceware.org (Postfix) with ESMTPS id BF7953857C4F for ; Mon, 15 Nov 2021 18:38:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BF7953857C4F Received: by mail-ua1-x935.google.com with SMTP id i6so36898074uae.6 for ; Mon, 15 Nov 2021 10:38:00 -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=hf5tARBz92ZEm/vZl4Y0l0cz8TzjGknh/Ho8cz7Ryxg=; b=R7BqaLZ/QG5nAqaZKfkw7TZeUDGGQDY4sirxjdmiR1nN/YhwA9JO/QBagHqD+R6s6y COWDLotjhd55KrKwPwbhMBKixLOOCqxWSMDewkkIa0Hzjr3C2mSNzu5W9gWqlg2G9ss4 Qv9xhrqt7F+UPWpswKgjJNKJfu4NS1p40W5KyDIHIAU0Nd949A1+Wnfj3qWNXIyZyUjJ GmMW/Qb9iKl6E0R79/c3GV83Cwn9xiV6TK0DF2CHYoXX0QVkz5vIo0SC4EAr/7Rpa/A/ 8XxAz+/6AItiJlzzxNaMD+9azM/KKlY1JhLjNMXX1nrnxVrAf7m0KGYeROHYNOc3IMtu SnNA== X-Gm-Message-State: AOAM533FxaVv4xCv3jI4l1FEMrN7p5s2ZGY50D/5//jKxhRw3swswk4C xJc2rc4T5h51eBj4dVNvCGxGnb9DMaqA2A== X-Google-Smtp-Source: ABdhPJzaMbvh+b3P23FpL9/l9ifGPMgVAojT3aqJ+Kj+TpYxF3djl+2SHf4mFN2lqJ+yFVqAUCezJQ== X-Received: by 2002:a67:c982:: with SMTP id y2mr45266083vsk.15.1637001480115; Mon, 15 Nov 2021 10:38:00 -0800 (PST) Received: from birita.. ([2804:431:c7ca:66dc:13f5:e2fb:5a0d:90]) by smtp.gmail.com with ESMTPSA id e7sm8976565vkn.20.2021.11.15.10.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Nov 2021 10:37:59 -0800 (PST) To: libc-alpha@sourceware.org, Florian Weimer Subject: [PATCH v6 12/20] elf: Do not fail for failed dlmopen on audit modules (BZ #28061) Date: Mon, 15 Nov 2021 15:37:26 -0300 Message-Id: <20211115183734.531155-13-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211115183734.531155-1-adhemerval.zanella@linaro.org> References: <20211115183734.531155-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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" The dl_main() sets the LM_ID_BASE to RT_ADD just before starting to add load new shared objects. The state is set to R_CONSISTENT just after all objects are loaded. However if a audit modules tries to dlmopen() an inexistent module, the _dl_open() will assert that the namespace is in an inconsistent state. This is different than dlopen(), since first it will not use LM_ID_BASE and second _dl_map_object_from_fd() is the sole responsible to set and reset the r_state value. So the assert() on _dl_open() can not really be seen if the state is consistent, since _dt_main() resets it. This patch removes the assert. Checked on x86_64-linux-gnu, i686-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Florian Weimer --- elf/Makefile | 5 ++++ elf/dl-open.c | 2 -- elf/tst-audit20.c | 25 +++++++++++++++++++ elf/tst-auditmod20.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 elf/tst-audit20.c create mode 100644 elf/tst-auditmod20.c diff --git a/elf/Makefile b/elf/Makefile index 19ec680144..4636a2743a 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -233,6 +233,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-audit18 \ tst-audit19a \ tst-audit19b \ + tst-audit20 \ # reldep9 tests-internal += loadtest unload unload2 circleload1 \ neededtest neededtest2 neededtest3 neededtest4 \ @@ -378,6 +379,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-auditmod19a \ tst-auditmod19b \ tst-audit19bmod \ + tst-auditmod20 \ # Most modules build with _ISOMAC defined, but those filtered out # depend on internal headers. @@ -1570,6 +1572,9 @@ $(objpfx)tst-audit19b.out: $(objpfx)tst-auditmod19b.so $(objpfx)tst-audit19b: $(objpfx)tst-audit19bmod.so tst-audit19b-ARGS = -- $(host-test-program-cmd) +$(objpfx)tst-audit20.out: $(objpfx)tst-auditmod20.so +tst-audit20-ENV = LD_AUDIT=$(objpfx)tst-auditmod20.so + # 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-open.c b/elf/dl-open.c index e2f2e713e7..4f4d72e325 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -914,8 +914,6 @@ no more namespaces available for dlmopen()")); the flag here. */ } - assert (_dl_debug_update (args.nsid)->r_state == RT_CONSISTENT); - /* Release the lock. */ __rtld_lock_unlock_recursive (GL(dl_load_lock)); diff --git a/elf/tst-audit20.c b/elf/tst-audit20.c new file mode 100644 index 0000000000..6f39ccee86 --- /dev/null +++ b/elf/tst-audit20.c @@ -0,0 +1,25 @@ +/* Check dlopen failure on audit modules. + Copyright (C) 2021 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 + . */ + +static int +do_test (void) +{ + return 0; +} + +#include diff --git a/elf/tst-auditmod20.c b/elf/tst-auditmod20.c new file mode 100644 index 0000000000..c57e50ee4e --- /dev/null +++ b/elf/tst-auditmod20.c @@ -0,0 +1,57 @@ +/* Check dlopen failure on audit modules. + Copyright (C) 2021 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 + +unsigned int +la_version (unsigned int v) +{ + return LAV_CURRENT; +} + +static void +check (void) +{ + { + void *mod = dlopen ("nonexistent.so", RTLD_NOW); + if (mod != NULL) + abort (); + } + + { + void *mod = dlmopen (LM_ID_BASE, "nonexistent.so", RTLD_NOW); + if (mod != NULL) + abort (); + } +} + +void +la_activity (uintptr_t *cookie, unsigned int flag) +{ + if (flag != LA_ACT_CONSISTENT) + return; + check (); +} + +void +la_preinit (uintptr_t *cookie) +{ + check (); +}