From patchwork Tue Dec 5 15:35:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 81431 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 4A76D38708A0 for ; Tue, 5 Dec 2023 15:37:23 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 906A53857C42 for ; Tue, 5 Dec 2023 15:37:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 906A53857C42 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 906A53857C42 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701790628; cv=none; b=jY/Xj2b3A8Ys7TPEkwCMkbOn6KNQZ49mJvRRtd7b2WGEdf/dTXvswrLls6eaApNHftyFOz3quyTXnqaiGBHe/3CzX0cfPLzpLFz0hSxKOlAaGiMsx7x/eLb08H6/EXtTkiRPDeLIgJmjaUVNLFNlcjxHCAfpUZwgC1Depgd5iw8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701790628; c=relaxed/simple; bh=5ftRXqtFMPt/9ODtwW4EZk0H4NhdyCA/UmKw7piCF2s=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=kybdVKrHZdwclkjETC+QPzAJAkQWohdWaHjkYhDlvb5IedFEb89Ax4NLWdrmnV3c/zNpXgC45mODrXtRfco85drF4a6ei8CRGX3Oh/UJ+Id4JpHqs/FYCMIRPGK2zD8g9TOxRuWe6mq0c5+X8tI5lDrmaeCXqTSDFWt6uyVn+UQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701790626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pWEI2fU8lV+lfJ0CPdc/mrkqEFSVsscmzrIWQSYi0mU=; b=ZLspbWLB4AFSXYZyf1r03lURfzHOApHLAeEPayzGXoxeb9rxbzhm+dwrtEJZFVgi5qJMOc yOs0b4NBxs/CvwgkuJHjGK2rACVKr3DzMyNzjq7872wo8bNR4Y5jtkyvkTOoTk7PLZAih0 7JP3lkTJknaoGqMZnSm2nhU1++7FfCQ= Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-92-H7s7YyFKP2C1tRuFAdsaOg-1; Tue, 05 Dec 2023 10:35:53 -0500 X-MC-Unique: H7s7YyFKP2C1tRuFAdsaOg-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-5d98fde753eso16125477b3.2 for ; Tue, 05 Dec 2023 07:35:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701790547; x=1702395347; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pWEI2fU8lV+lfJ0CPdc/mrkqEFSVsscmzrIWQSYi0mU=; b=mKY1wmPXIyMVwZO24NqI2jdn8NLSqObWSqT/SHaB8LpSPU9E98DXWUkfQc+9cDx5Rp LYodEHERRj9eNWuAe5AfGdEnfa2YWCN1K7StwwMj0Ake8KNbu5Q+SsH4tHUQLQWGoPPf 1MNVsJhXzbo/99YAQRARWb8uUPr3iXFyHZ6okZhpyaCq9wkjmodxlDE2pSi3GFJk0y8i 0TtJLJBRDOVnSzpgiXWzkDTYJnwJ7rY9Z+jsAYUJUDvyr7SMR6Bg6Sr1B/phmRD8gv7X wM9W4ao3ztpe/soPSrCNa+LEzeIm3u4rePDy8QMg3CtM6dISQCe1iSnG/MS4Bt+jL7gd PCdA== X-Gm-Message-State: AOJu0YzaqfwxLdzllj2svsbsKbArYTVdrhZmEMuA+yy7L7S8hZHFs/Ix wgTYF+CXP/c+5zXg1KDdvYu0TnoXyxwMc155XVjpUr1AhRdn2YsO1oRPtlv7ju2a4sdid6ODNKW AzidHUBkhv21S4hA2Pj3NGrQ3Fa/oXXGx75MGbrgmCZJDBXoMrThdv5pR8ltcfZhPrWXz9kTH8h JZxLEx X-Received: by 2002:a81:4cd0:0:b0:5d7:1941:2c19 with SMTP id z199-20020a814cd0000000b005d719412c19mr5135231ywa.70.1701790546620; Tue, 05 Dec 2023 07:35:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IFflpvE0Vd0j6H/NlSbhPG3hErPKQGPWfjhabHEDFoR3bZZmxNvSa+02szKbYMyg2g0Z5eJuw== X-Received: by 2002:a81:4cd0:0:b0:5d7:1941:2c19 with SMTP id z199-20020a814cd0000000b005d719412c19mr5135214ywa.70.1701790546235; Tue, 05 Dec 2023 07:35:46 -0800 (PST) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id l6-20020a0dc906000000b005add997ae53sm3276479ywd.81.2023.12.05.07.35.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 07:35:45 -0800 (PST) From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH] rtld: Add glibc.rtld.enable_secure tunable. Date: Tue, 5 Dec 2023 10:35:32 -0500 Message-ID: <20231205153543.4084715-1-josimmon@redhat.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Add a tunable for setting __libc_enable_secure to 1. Does not set __libc_enable_secure to 0 if the tunable is set to 0. Ignores any tunables following glib.rtld.enable_secure. One use-case for this addition is to enable testing code paths that depend on __libc_eanble_secure being set without the need to use setxid binaries. --- NOTE: I'm not certain I've picked the appropriate place to handle glibc.rtld.enable_secure. I tried to make it happen as early as possible to minimize and places where __libc_enable_secure might be checked before the tunable initialization takes place. NEWS | 4 ++ csu/libc-start.c | 4 ++ elf/Makefile | 2 + elf/dl-tunables.c | 8 ++- elf/dl-tunables.h | 11 +++ elf/dl-tunables.list | 6 ++ elf/tst-rtld-list-tunables.exp | 1 + elf/tst-tunables-enable_secure.c | 115 +++++++++++++++++++++++++++++++ 8 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 elf/tst-tunables-enable_secure.c diff --git a/NEWS b/NEWS index 8c1c149f91..b04fb15064 100644 --- a/NEWS +++ b/NEWS @@ -43,6 +43,10 @@ Major new features: on thread stack created by pthread_create or memory allocated by malloc). +* A new tunable, glibc.rtld.enable_secure, used to set __libc_enable_secure + to 1. Setting the tunable to 0 does *NOT* set __libc_enable_secure to 0. + Once the tunable is encountered all following tunables are ignored. + Deprecated and removed features, and other changes affecting compatibility: * The ldconfig program now skips file names containing ';' or ending in diff --git a/csu/libc-start.c b/csu/libc-start.c index c3bb6d09bc..2f546a3677 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -266,6 +266,10 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), __tunables_init (__environ); + int32_t tes = TUNABLE_GET_FULL (glibc, rtld, enable_secure, int32_t, NULL); + if (tes == 1) + __libc_enable_secure = 1; + ARCH_INIT_CPU_FEATURES (); /* Do static pie self relocation after tunables and cpu features diff --git a/elf/Makefile b/elf/Makefile index afec7be084..6c38a72b0d 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -285,6 +285,7 @@ tests-static-internal := \ tst-tls1-static \ tst-tls1-static-non-pie \ tst-tunables \ + tst-tunables-enable_secure \ # tests-static-internal CRT-tst-tls1-static-non-pie := $(csu-objpfx)crt1.o @@ -2672,6 +2673,7 @@ $(objpfx)tst-glibc-hwcaps-mask.out: \ $(objpfx)tst-glibc-hwcaps-cache.out: $(objpfx)tst-glibc-hwcaps tst-tunables-ARGS = -- $(host-test-program-cmd) +tst-tunables-enable_secure-ARGS = -- $(host-test-program-cmd) $(objpfx)list-tunables.out: tst-rtld-list-tunables.sh $(objpfx)ld.so $(SHELL) $< $(objpfx)ld.so '$(test-wrapper-env)' \ diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index 644d21d1b0..d6c55cfaf2 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -250,7 +250,13 @@ parse_tunables (char *valstring) } for (int i = 0; i < ntunables; i++) - tunable_initialize (tunables[i].t, tunables[i].value); + { + tunable_initialize (tunables[i].t, tunables[i].value); + + /* Ignore all tunables after encountering "glibc.rtld.enable_secure" */ + if (tunable_strcmp(tunables[i].t->name, "glibc.rtld.enable_secure") == 0) + break; + } } /* Initialize the tunables list from the environment. For now we only use the diff --git a/elf/dl-tunables.h b/elf/dl-tunables.h index 0df4dde24e..2d4fc84d74 100644 --- a/elf/dl-tunables.h +++ b/elf/dl-tunables.h @@ -164,4 +164,15 @@ tunable_is_name (const char *orig, const char *envname) return false; } +/* Compare two strings. */ +static __always_inline int +tunable_strcmp (const char *left, const char *right) +{ + for (;*left != '\0' && *right != '\0'; right++, left++) + if (*left != *right) + break; + + return *left - *right; +} + #endif diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list index 1b23fc9473..cb1b35854e 100644 --- a/elf/dl-tunables.list +++ b/elf/dl-tunables.list @@ -136,6 +136,12 @@ glibc { minval: 0 default: 512 } + enable_secure { + type: INT_32 + minval: 0 + maxval: 1 + default: 0 + } } mem { diff --git a/elf/tst-rtld-list-tunables.exp b/elf/tst-rtld-list-tunables.exp index 2233ea9c7c..db0e1c86e9 100644 --- a/elf/tst-rtld-list-tunables.exp +++ b/elf/tst-rtld-list-tunables.exp @@ -12,5 +12,6 @@ glibc.malloc.tcache_unsorted_limit: 0x0 (min: 0x0, max: 0x[f]+) glibc.malloc.top_pad: 0x20000 (min: 0x0, max: 0x[f]+) glibc.malloc.trim_threshold: 0x0 (min: 0x0, max: 0x[f]+) glibc.rtld.dynamic_sort: 2 (min: 1, max: 2) +glibc.rtld.enable_secure: 0 (min: 0, max: 1) glibc.rtld.nns: 0x4 (min: 0x1, max: 0x10) glibc.rtld.optional_static_tls: 0x200 (min: 0x0, max: 0x[f]+) diff --git a/elf/tst-tunables-enable_secure.c b/elf/tst-tunables-enable_secure.c new file mode 100644 index 0000000000..e749ec9f17 --- /dev/null +++ b/elf/tst-tunables-enable_secure.c @@ -0,0 +1,115 @@ +/* Check GLIBC_TUNABLES parsing for enable_secure. + Copyright (C) 2023 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 + +static int restart; +#define CMDLINE_OPTIONS \ + { "restart", no_argument, &restart, 1 }, + +static const struct test_t +{ + const char *env; + int32_t expected_malloc_check; + int32_t expected_enable_secure; +} tests[] = +{ + /* Expected tunable format. */ + { + "glibc.malloc.check=2:glibc.rtld.enable_secure=1", + 2, + 1, + }, + /* Tunables encountered after enable_secure should be ignored. */ + { + "glibc.rtld.enable_secure=1:glibc.malloc.check=2", + 0, + 1, + }, +}; + +static int +handle_restart (int i) +{ + TEST_COMPARE (tests[i].expected_malloc_check, + TUNABLE_GET_FULL (glibc, malloc, check, int32_t, NULL)); + TEST_COMPARE (tests[i].expected_enable_secure, + TUNABLE_GET_FULL (glibc, rtld, enable_secure, int32_t, NULL)); + if (tests[i].expected_enable_secure == 1) + { + TEST_COMPARE (1, __libc_enable_secure); + } + return 0; +} + +static int +do_test (int argc, char *argv[]) +{ + /* We must have either: + - One or four parameters left if called initially: + + path to ld.so optional + + "--library-path" optional + + the library path optional + + the application name + + the test to check */ + + TEST_VERIFY_EXIT (argc == 2 || argc == 5); + + if (restart) + return handle_restart (atoi (argv[1])); + + char nteststr[INT_BUFSIZE_BOUND (int)]; + + char *spargv[10]; + { + int i = 0; + for (; i < argc - 1; i++) + spargv[i] = argv[i + 1]; + spargv[i++] = (char *) "--direct"; + spargv[i++] = (char *) "--restart"; + spargv[i++] = nteststr; + spargv[i] = NULL; + } + + for (int i = 0; i < array_length (tests); i++) + { + snprintf (nteststr, sizeof nteststr, "%d", i); + + printf ("[%d] Spawned test for %s\n", i, tests[i].env); + setenv ("GLIBC_TUNABLES", tests[i].env, 1); + struct support_capture_subprocess result + = support_capture_subprogram (spargv[0], spargv); + support_capture_subprocess_check (&result, "tst-tunables-enable_secure", + 0, sc_allow_stderr); + support_capture_subprocess_free (&result); + } + + return 0; +} + +#define TEST_FUNCTION_ARGV do_test +#include