From: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date: Thu, 14 Dec 2017 19:18:12 +0000 (+0530)
Subject: Remove redundant mention of SXID_ERASE
X-Git-Tag: glibc-2.27~279
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa6932aa7b3d0020a299f4b928eb125c8bcc0ca3;p=thirdparty%2Fglibc.git

Remove redundant mention of SXID_ERASE

SXID_ERASE is implicit for all environment variables.  Avoid
mentioning it in the tunables list; that way only the ones with
SXID_IGNORE remain prominent and mentioned.  TODO: we need to audit
each of those cases and drop them to SXID_ERASE wherever possible.
---

diff --git a/ChangeLog b/ChangeLog
index 018edea1fbb..3ae1fd2ddf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-12-14  Siddhesh Poyarekar  <siddhesh@sourceware.org>
+
+	* elf/dl-tunables.list: Remove redundant SXID_ERASE.
+
 2017-12-14  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #22607]
diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list
index ec0fe207876..cf1cf4c2f6c 100644
--- a/elf/dl-tunables.list
+++ b/elf/dl-tunables.list
@@ -78,15 +78,12 @@ glibc {
     }
     tcache_max {
       type: SIZE_T
-      security_level: SXID_ERASE
     }
     tcache_count {
       type: SIZE_T
-      security_level: SXID_ERASE
     }
     tcache_unsorted_limit {
       type: SIZE_T
-      security_level: SXID_ERASE
     }
   }
   tune {
@@ -94,7 +91,7 @@ glibc {
       type: UINT_64
       env_alias: LD_HWCAP_MASK
       default: HWCAP_IMPORTANT
-      }
+    }
   }
 
   elision {
@@ -102,32 +99,26 @@ glibc {
       type: INT_32
       minval: 0
       maxval: 1
-      security_level: SXID_ERASE
     }
     skip_lock_busy {
       type: INT_32
       default: 3
-      security_level: SXID_ERASE
     }
     skip_lock_internal_abort {
       type: INT_32
       default: 3
-      security_level: SXID_ERASE
     }
     skip_lock_after_retries {
       type: INT_32
       default: 3
-      security_level: SXID_ERASE
     }
     tries {
       type: INT_32
       default: 3
-      security_level: SXID_ERASE
     }
     skip_trylock_internal_abort {
       type: INT_32
       default: 3
-      security_level: SXID_ERASE
     }
   }
 }