8b9e9c3c0b
Florian Weimer pointed out that we have three different kinds of environment variables (and hence tunables): 1. Variables that are removed for setxid processes 2. Variables that are ignored in setxid processes but is passed on to child processes 3. Variables that are passed on to child processes all the time Tunables currently only does (2) and (3) when it should be doing (1) for MALLOC_CHECK_. This patch enhances the is_secure flag in tunables to an enum value that can specify which of the above three categories the tunable (and its envvar alias) belongs to. The default is for tunables to be in (1). Hence, all of the malloc tunables barring MALLOC_CHECK_ are explicitly specified to belong to category (2). There were discussions around abolishing category (2) completely but we can do that as a separate exercise in 2.26. Tested on x86_64 to verify that there are no regressions. [BZ #21073] * elf/dl-tunable-types.h (tunable_seclevel_t): New enum. * elf/dl-tunables.c (tunables_strdup): Remove. (get_next_env): Also return the previous envp. (parse_tunables): Erase tunables of category TUNABLES_SECLEVEL_SXID_ERASE. (maybe_enable_malloc_check): Make MALLOC_CHECK_ TUNABLE_SECLEVEL_NONE if /etc/setuid-debug is accessible. (__tunables_init)[TUNABLES_FRONTEND == TUNABLES_FRONTEND_valstring]: Update GLIBC_TUNABLES envvar after parsing. [TUNABLES_FRONTEND != TUNABLES_FRONTEND_valstring]: Erase tunable envvars of category TUNABLES_SECLEVEL_SXID_ERASE. * elf/dl-tunables.h (struct _tunable): Change member is_secure to security_level. * elf/dl-tunables.list: Add security_level annotations for all tunables. * scripts/gen-tunables.awk: Recognize and generate enum values for security_level. * elf/tst-env-setuid.c: New test case. * elf/tst-env-setuid-tunables: new test case. * elf/Makefile (tests-static): Add them.
81 lines
2.2 KiB
Plaintext
81 lines
2.2 KiB
Plaintext
# Copyright (C) 2016-2017 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
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
# Allowed attributes for tunables:
|
|
#
|
|
# type: Defaults to STRING
|
|
# minval: Optional minimum acceptable value
|
|
# maxval: Optional maximum acceptable value
|
|
# env_alias: An alias environment variable
|
|
# security_level: Specify security level of the tunable. Valid values are:
|
|
#
|
|
# SXID_ERASE: (default) Don't read for AT_SECURE binaries and
|
|
# removed so that child processes can't read it.
|
|
# SXID_IGNORE: Don't read for AT_SECURE binaries, but retained for
|
|
# non-AT_SECURE subprocesses.
|
|
# SXID_NONE: Read all the time.
|
|
|
|
glibc {
|
|
malloc {
|
|
check {
|
|
type: INT_32
|
|
minval: 0
|
|
maxval: 3
|
|
env_alias: MALLOC_CHECK_
|
|
}
|
|
top_pad {
|
|
type: SIZE_T
|
|
env_alias: MALLOC_TOP_PAD_
|
|
security_level: SXID_IGNORE
|
|
}
|
|
perturb {
|
|
type: INT_32
|
|
minval: 0
|
|
maxval: 0xff
|
|
env_alias: MALLOC_PERTURB_
|
|
security_level: SXID_IGNORE
|
|
}
|
|
mmap_threshold {
|
|
type: SIZE_T
|
|
env_alias: MALLOC_MMAP_THRESHOLD_
|
|
security_level: SXID_IGNORE
|
|
}
|
|
trim_threshold {
|
|
type: SIZE_T
|
|
env_alias: MALLOC_TRIM_THRESHOLD_
|
|
security_level: SXID_IGNORE
|
|
}
|
|
mmap_max {
|
|
type: INT_32
|
|
env_alias: MALLOC_MMAP_MAX_
|
|
security_level: SXID_IGNORE
|
|
}
|
|
arena_max {
|
|
type: SIZE_T
|
|
env_alias: MALLOC_ARENA_MAX
|
|
minval: 1
|
|
security_level: SXID_IGNORE
|
|
}
|
|
arena_test {
|
|
type: SIZE_T
|
|
env_alias: MALLOC_ARENA_TEST
|
|
minval: 1
|
|
security_level: SXID_IGNORE
|
|
}
|
|
}
|
|
}
|