about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@sourceware.org>2020-10-22 11:39:00 +0530
committerSiddhesh Poyarekar <siddhesh@sourceware.org>2020-10-22 13:52:38 +0530
commit6c2b579962853475747854127cfaf4ec4a8872a7 (patch)
treef5a4e0e0eec7ad0efc781665459d4a9974f8ceb0
parent4be44c3208b0498b108ce75e5d69e7c04d1cdf57 (diff)
downloadglibc-6c2b579962853475747854127cfaf4ec4a8872a7.tar.gz
glibc-6c2b579962853475747854127cfaf4ec4a8872a7.tar.xz
glibc-6c2b579962853475747854127cfaf4ec4a8872a7.zip
Reword description of SXID_* tunable properties
The SXID_* tunable properties only influence processes that are
AT_SECURE, so make that a bit more explicit in the documentation and
comment.

Revisiting the code after a few years I managed to confuse myself, so
I imagine there could be others who may have incorrectly assumed like
I did that the SXID_ERASE tunables are not inherited by children of
non-AT_SECURE processes.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
-rw-r--r--elf/dl-tunables.list11
-rw-r--r--manual/README.tunables11
2 files changed, 12 insertions, 10 deletions
diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list
index 35634ef24d..e1d8225128 100644
--- a/elf/dl-tunables.list
+++ b/elf/dl-tunables.list
@@ -21,12 +21,13 @@
 # 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:
+# security_level: Specify security level of the tunable for AT_SECURE binaries.
+# 		  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_ERASE: (default) Do not read and do not pass on to
+# 	     child processes.
+# 	     SXID_IGNORE: Do not read, but retain for non-AT_SECURE
+# 	     subprocesses.
 # 	     NONE: Read all the time.
 
 glibc {
diff --git a/manual/README.tunables b/manual/README.tunables
index fff6c2a87e..d8c768abcc 100644
--- a/manual/README.tunables
+++ b/manual/README.tunables
@@ -59,12 +59,13 @@ The list of allowed attributes are:
 
 - env_alias:		An alias environment variable
 
-- security_level:	Specify security level of the tunable.  Valid values:
+- security_level:	Specify security level of the tunable for AT_SECURE
+			binaries.  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_ERASE: (default) Do not read and do not pass on to
+			child processes.
+			SXID_IGNORE: Do not read, but retain for non-AT_SECURE
+			child processes.
 			NONE: Read all the time.
 
 2. Use TUNABLE_GET/TUNABLE_SET/TUNABLE_SET_WITH_BOUNDS to get and set tunables.