From patchwork Wed Dec 22 13:27:07 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: 49187 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 154EF3858425 for ; Wed, 22 Dec 2021 13:34:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 154EF3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1640180097; bh=KG9BDe+Xiyo0aOpa1Kjw6qOg7b3nyy//81i6f+KwjfU=; 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=u9KH7IpPht5AxKfFUZxL9Cqvcei4bRGF4DydB3bNwZbABK8iPg9wpoif/wVYjfZ2y +g5dhQQ3pryNZAzSW5xCdga97rPHX1YpikfzMyw34uQY5P6XiApaA+tuy4vgLopf2a 7GXIVZay7zNvHSAitABgnEIjFI+6ZCuvNohU+v/A= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by sourceware.org (Postfix) with ESMTPS id 55C87385841C for ; Wed, 22 Dec 2021 13:27:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 55C87385841C Received: by mail-qt1-x833.google.com with SMTP id 8so1877380qtx.5 for ; Wed, 22 Dec 2021 05:27:51 -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=KG9BDe+Xiyo0aOpa1Kjw6qOg7b3nyy//81i6f+KwjfU=; b=5fHOBELtgdcsJy+LTNvNNl/tu//dr/dW5Co+oLQYjfBRniE0RNLOsYPHrjOF+CndGe os056UcODw41Ce07+AwEuqUJI7OMvgWV8M30beiazfjczymndl67n2+vgfFh9nLM50PP SfukHbsE71ZLm4j3bbz0D5nm2P+TMW94a1awliZe9xNNvI6VIVZYwEFk9T2ThJwV/vop u2m6oikHwmjRdTgj+svb7EOdaqbHF8YD96q6tDTeuXoEQVFcyf2G8xD0ISvW79rSw4a7 8cHbhFDXs6Cd8ZwGNl7YBA1HI5ikBztcxq8L0S/P7m2ap230l0DMYgDiAyQlSFOmMfjg euvQ== X-Gm-Message-State: AOAM532ZiwBnmJLk5Oe0oYNJnMljE/xFCii8UrS7pIyh5vmI4tu5XpRv b7tXCkFeg4P0VKOLyl0bgG8VlpCxFrtxDQ== X-Google-Smtp-Source: ABdhPJxNPBb/pZI3C+OtthSaV40oeBpuOXuzjCm5BtDH6UofHGpCSMtvcgcCxYoXjx0jBrnykLKecg== X-Received: by 2002:ac8:594e:: with SMTP id 14mr1990047qtz.105.1640179670505; Wed, 22 Dec 2021 05:27:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 05:27:50 -0800 (PST) To: libc-alpha@sourceware.org, fweimer@redhat.com Subject: [PATCH v7 11/16] elf: Do not fail for failed dlmopen on audit modules (BZ #28061) Date: Wed, 22 Dec 2021 10:27:07 -0300 Message-Id: <20211222132712.523295-12-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, 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 RT_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 7fcb9c9b2c..3891576bc8 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -232,6 +232,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-dl-is_dso tst-ro-dynamic \ tst-audit18 \ tst-audit19b \ + tst-audit20 \ tst-rtld-run-static \ # reldep9 tests-internal += loadtest unload unload2 circleload1 \ @@ -382,6 +383,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. @@ -1594,6 +1596,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 (); +}