From e14b81b15e479afbc4820a2b9bb60f3cf65bfb12 Mon Sep 17 00:00:00 2001
From: Ashlen <dev@anthes.is>
Date: Tue, 20 May 2025 21:34:03 -0600
Subject: [PATCH 01/22] perf(permission-hardener): optimize string match
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace subprocess grep calls with bash substring matching in
check_nosuid_whitelist function. This eliminates ~10k unneeded
subprocess spawns that were causing significant performance
degradation.

In testing, it improves overall script execution speed by an
order of magnitude:

Before patch:
$ sudo hyperfine -- './permission-hardener enable'
Benchmark 1: ./permission-hardener enable
  Time (mean ± σ):     11.906 s ±  0.974 s    [User: 3.639 s, System: 8.728 s]
  Range (min … max):   10.430 s … 14.090 s    10 runs

After patch:
$ sudo hyperfine -- './permission-hardener enable'
Benchmark 1: ./permission-hardener enable
  Time (mean ± σ):     802.8 ms ± 178.5 ms    [User: 283.0 ms, System: 471.9 ms]
  Range (min … max):   639.4 ms … 1092.3 ms    10 runs
---
 usr/bin/permission-hardener | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/usr/bin/permission-hardener b/usr/bin/permission-hardener
index 9f70834..b871fdc 100755
--- a/usr/bin/permission-hardener
+++ b/usr/bin/permission-hardener
@@ -256,8 +256,7 @@ check_nosuid_whitelist() {
   [[ " ${policy_exact_white_list[*]} " =~ " ${target_file} " ]] && return 1
 
   for match_white_list_entry in "${policy_match_white_list[@]:-}"; do
-    if safe_echo "${target_file}" \
-      | grep --quiet --fixed-strings -- "${match_white_list_entry}"; then
+    if [[ "${target_file}" == *"${match_white_list_entry}"* ]]; then
       return 1
     fi
   done

From 5c981e0891ef009c5c2355f5f6383aca22c45638 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 06:55:09 -0400
Subject: [PATCH 02/22] pam-info: fix, consistently write errors and warnings
 to stderr

---
 usr/libexec/security-misc/pam-info | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 736e44f..00cab0b 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -76,7 +76,7 @@ if [ "$PAM_USER" = 'sysmaint' ]; then
    sysmaint_passwd_info="$(passwd --status sysmaint 2>/dev/null)" || true
    sysmaint_lock_info="$(cut -d' ' -f2 <<< "${sysmaint_passwd_info}")"
    if [ "${sysmaint_lock_info}" = 'L' ]; then
-      printf '%s\n' "$0: ERROR: Reboot and choose 'PERSISTENT Mode - SYSMAINT Session' for system maintenance. See https://www.kicksecure.com/wiki/Sysmaint"
+      printf '%s\n' "$0: ERROR: Reboot and choose 'PERSISTENT Mode - SYSMAINT Session' for system maintenance. See https://www.kicksecure.com/wiki/Sysmaint" >&2
    fi
 fi
 
@@ -86,7 +86,7 @@ fi
 
 if [ "$PAM_USER" != 'sysmaint' ]; then
    if [[ "${kernel_cmdline}" =~ 'boot-role=sysmaint' ]]; then
-      printf '%s\n' "$0: WARNING: Use account 'sysmaint' for system maintenance. See https://www.kicksecure.com/wiki/Sysmaint"
+      printf '%s\n' "$0: WARNING: Use account 'sysmaint' for system maintenance. See https://www.kicksecure.com/wiki/Sysmaint" >&2
    fi
 fi
 

From 5930e270521e0e5d6a0a3877c813accbf5253051 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 07:05:25 -0400
Subject: [PATCH 03/22] pam-info: improve error handling

https://github.com/Kicksecure/security-misc/pull/305#issuecomment-2892378246
---
 usr/libexec/security-misc/pam-info | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 00cab0b..0f30faf 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -19,8 +19,22 @@ fi
 
 true "$0: START PHASE 2"
 
+set -o errexit
+set -o errtrace
 set -o pipefail
 
+error_handler() {
+   exit_code="$?"
+   printf '%s\n' "\
+$0: ERROR: Unexpected error.
+BASH_COMMAND: '$BASH_COMMAND'
+exit_code: '$exit_code'
+ERROR: Please report this bug." >&2
+   exit 1
+}
+
+trap error_handler ERR
+
 ## Named constants.
 pam_faillock_state_dir="/var/lib/security-misc/faillock"
 
@@ -35,7 +49,7 @@ if [ "$PAM_USER" = "" ]; then
    exit 0
 fi
 
-grep_result="$(grep -- "accessfile=/etc/security/access-security-misc.conf" /etc/pam.d/common-account 2>/dev/null)"
+grep_result="$(grep -- "accessfile=/etc/security/access-security-misc.conf" /etc/pam.d/common-account 2>/dev/null)" || true
 
 ## Check if grep matched something.
 if [ ! "$grep_result" = "" ]; then

From 353b6e83c55d52b47a2a35063406324cec7237c4 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 07:20:13 -0400
Subject: [PATCH 04/22] test that `wc` is functional

https://github.com/Kicksecure/security-misc/pull/305#issuecomment-2892378246
---
 usr/libexec/security-misc/apt-get-update-sanity-test | 10 ++++++++++
 usr/libexec/security-misc/pam-info                   | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/usr/libexec/security-misc/apt-get-update-sanity-test b/usr/libexec/security-misc/apt-get-update-sanity-test
index a5b7709..f96a4f8 100755
--- a/usr/libexec/security-misc/apt-get-update-sanity-test
+++ b/usr/libexec/security-misc/apt-get-update-sanity-test
@@ -7,5 +7,15 @@ set -x
 set -e
 set -o pipefail
 
+if ! printf '%s\n' | wc -l >/dev/null ; then
+  printf "\
+$0: ERROR: command 'wc' test failed! Do not ignore this!
+
+'wc' can core dump. Example:
+zsh: illegal hardware instruction (core dumped) wc -l
+https://github.com/rspamd/rspamd/issues/5137" >&2
+  exit 1
+fi
+
 wc -L "/var/lib/apt/lists/"*InRelease
 wc -L "/var/lib/apt/lists/"*InRelease | awk '$1 > 1024 {print; exit 1}'
diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 0f30faf..3ac9a5d 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -35,6 +35,16 @@ ERROR: Please report this bug." >&2
 
 trap error_handler ERR
 
+if ! printf '%s\n' | wc -l >/dev/null ; then
+  printf "\
+$0: ERROR: command 'wc' test failed! Do not ignore this!
+
+'wc' can core dump. Example:
+zsh: illegal hardware instruction (core dumped) wc -l
+https://github.com/rspamd/rspamd/issues/5137" >&2
+  exit 1
+fi
+
 ## Named constants.
 pam_faillock_state_dir="/var/lib/security-misc/faillock"
 

From ff6bc5d5b6097bcdddd8e66c2541106c2cbabbaf Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 11:23:39 +0000
Subject: [PATCH 05/22] bumped changelog version

---
 changelog.upstream | 28 ++++++++++++++++++++++++++++
 debian/changelog   |  6 ++++++
 2 files changed, 34 insertions(+)

diff --git a/changelog.upstream b/changelog.upstream
index e64e373..3ad374b 100644
--- a/changelog.upstream
+++ b/changelog.upstream
@@ -1,3 +1,31 @@
+commit 353b6e83c55d52b47a2a35063406324cec7237c4
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 07:20:13 2025 -0400
+
+    test that `wc` is functional
+    
+    https://github.com/Kicksecure/security-misc/pull/305#issuecomment-2892378246
+
+commit 5930e270521e0e5d6a0a3877c813accbf5253051
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 07:05:25 2025 -0400
+
+    pam-info: improve error handling
+    
+    https://github.com/Kicksecure/security-misc/pull/305#issuecomment-2892378246
+
+commit 5c981e0891ef009c5c2355f5f6383aca22c45638
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 06:55:09 2025 -0400
+
+    pam-info: fix, consistently write errors and warnings to stderr
+
+commit 19d7e1af5d7acf6eb3a20fe3ebf5f14cef041f92
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Tue May 20 11:40:27 2025 +0000
+
+    bumped changelog version
+
 commit 405880e63b92319626332d083a6c5ad5101dbf77
 Author: Patrick Schleizer <adrelanos@whonix.org>
 Date:   Sun May 18 06:44:42 2025 -0400
diff --git a/debian/changelog b/debian/changelog
index 6c74fa5..d865aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+security-misc (3:45.4-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Wed, 21 May 2025 11:23:39 +0000
+
 security-misc (3:45.3-1) unstable; urgency=medium
 
   * New upstream version (local package).

From 14cf205579ff65fa765d7574e5d0e301a30a1904 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 08:36:16 -0400
Subject: [PATCH 06/22] fix

---
 etc/profile.d/30_security-misc.sh | 6 +++---
 usr/bin/remount-secure            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/profile.d/30_security-misc.sh b/etc/profile.d/30_security-misc.sh
index c1adb22..8cb5673 100755
--- a/etc/profile.d/30_security-misc.sh
+++ b/etc/profile.d/30_security-misc.sh
@@ -4,8 +4,8 @@
 ## See the file COPYING for copying conditions.
 
 if [ -z "$XDG_CONFIG_DIRS" ]; then
-   XDG_CONFIG_DIRS=/etc/xdg
+   XDG_CONFIG_DIRS="/etc/xdg"
 fi
-if ! echo "$XDG_CONFIG_DIRS" | grep --quiet /usr/share/security-misc/ ; then
-   export XDG_CONFIG_DIRS=/usr/share/security-misc/:$XDG_CONFIG_DIRS
+if ! printf '%s\n' "$XDG_CONFIG_DIRS" | grep -- "/usr/share/security-misc/" >/dev/null 2>/dev/null ; then
+   export XDG_CONFIG_DIRS="/usr/share/security-misc/:$XDG_CONFIG_DIRS"
 fi
diff --git a/usr/bin/remount-secure b/usr/bin/remount-secure
index 865867d..957ad46 100755
--- a/usr/bin/remount-secure
+++ b/usr/bin/remount-secure
@@ -180,7 +180,7 @@ remount_secure() {
 
    $output_command "INFO: '$mount_folder' old_mount_options: '$old_mount_options'"
 
-   if echo "$old_mount_options" | grep --quiet "$intended_mount_options" ; then
+   if printf '%s\n' "$old_mount_options" | grep "$intended_mount_options" >/dev/null 2>/dev/null ; then
       $output_command "INFO: '$mount_folder' has already intended mount options. ('$intended_mount_options')"
       return 0
    fi

From bd01a683054b1f7d5a5f6cc4848da73b1b1ef5ff Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 13:58:18 +0000
Subject: [PATCH 07/22] bumped changelog version

---
 changelog.upstream | 12 ++++++++++++
 debian/changelog   |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/changelog.upstream b/changelog.upstream
index 3ad374b..748b236 100644
--- a/changelog.upstream
+++ b/changelog.upstream
@@ -1,3 +1,15 @@
+commit 14cf205579ff65fa765d7574e5d0e301a30a1904
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 08:36:16 2025 -0400
+
+    fix
+
+commit ff6bc5d5b6097bcdddd8e66c2541106c2cbabbaf
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 11:23:39 2025 +0000
+
+    bumped changelog version
+
 commit 353b6e83c55d52b47a2a35063406324cec7237c4
 Author: Patrick Schleizer <adrelanos@whonix.org>
 Date:   Wed May 21 07:20:13 2025 -0400
diff --git a/debian/changelog b/debian/changelog
index d865aba..589c983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+security-misc (3:45.5-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Wed, 21 May 2025 13:58:18 +0000
+
 security-misc (3:45.4-1) unstable; urgency=medium
 
   * New upstream version (local package).

From e1bae1c68aabc424924b6386fe4980d657dc2cdf Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 11:50:59 -0400
Subject: [PATCH 08/22] fix

---
 usr/libexec/security-misc/apt-get-update-sanity-test | 4 ++--
 usr/libexec/security-misc/pam-info                   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/libexec/security-misc/apt-get-update-sanity-test b/usr/libexec/security-misc/apt-get-update-sanity-test
index f96a4f8..7efac72 100755
--- a/usr/libexec/security-misc/apt-get-update-sanity-test
+++ b/usr/libexec/security-misc/apt-get-update-sanity-test
@@ -7,8 +7,8 @@ set -x
 set -e
 set -o pipefail
 
-if ! printf '%s\n' | wc -l >/dev/null ; then
-  printf "\
+if ! printf '%s\n' "" | wc -l >/dev/null ; then
+  printf '%s\n' "\
 $0: ERROR: command 'wc' test failed! Do not ignore this!
 
 'wc' can core dump. Example:
diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 3ac9a5d..c13bea4 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -35,8 +35,8 @@ ERROR: Please report this bug." >&2
 
 trap error_handler ERR
 
-if ! printf '%s\n' | wc -l >/dev/null ; then
-  printf "\
+if ! printf '%s\n' "" | wc -l >/dev/null ; then
+  printf '%s\n' "\
 $0: ERROR: command 'wc' test failed! Do not ignore this!
 
 'wc' can core dump. Example:

From 0eea681ce893a259563f8e9d5a2ec9722fbc635d Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 15:52:16 +0000
Subject: [PATCH 09/22] bumped changelog version

---
 changelog.upstream | 12 ++++++++++++
 debian/changelog   |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/changelog.upstream b/changelog.upstream
index 748b236..8b19816 100644
--- a/changelog.upstream
+++ b/changelog.upstream
@@ -1,3 +1,15 @@
+commit e1bae1c68aabc424924b6386fe4980d657dc2cdf
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 11:50:59 2025 -0400
+
+    fix
+
+commit bd01a683054b1f7d5a5f6cc4848da73b1b1ef5ff
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 13:58:18 2025 +0000
+
+    bumped changelog version
+
 commit 14cf205579ff65fa765d7574e5d0e301a30a1904
 Author: Patrick Schleizer <adrelanos@whonix.org>
 Date:   Wed May 21 08:36:16 2025 -0400
diff --git a/debian/changelog b/debian/changelog
index 589c983..886323c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+security-misc (3:45.6-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Wed, 21 May 2025 15:52:16 +0000
+
 security-misc (3:45.5-1) unstable; urgency=medium
 
   * New upstream version (local package).

From 784867e24b4d6f2899fa9b215ec9e3c4e2fb9d84 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:21:45 -0400
Subject: [PATCH 10/22] fix

---
 usr/libexec/security-misc/pam-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index c13bea4..907c684 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -212,7 +212,7 @@ fi
 deny=3
 
 if test -f /etc/security/faillock.conf ; then
-   deny_line=$(grep --invert-match "#" -- /etc/security/faillock.conf | grep -- "deny =")
+   deny_line=$(grep --invert-match "#" -- /etc/security/faillock.conf | grep -- "deny =") || true
    deny="$(printf '%s\n' "$deny_line" | str_replace "=" "" | str_replace "deny" "" | str_replace " " "")"
    ## Example:
    #deny=50

From ef8515ba82996b137c386eeb91e6f853d58a515f Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:23:45 -0400
Subject: [PATCH 11/22] improve error handling

---
 usr/libexec/security-misc/pam-info | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 907c684..cf50d2a 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -190,6 +190,14 @@ pam_faillock_output_count="$(printf '%s\n' "$pam_faillock_output" | wc -l)"
 ## example pam_faillock_output_count:
 ## 4
 
+if [[ "$deny" == *[!0-9]* ]]; then
+   printf '%s\n' "\
+$0: ERROR: Variable pam_faillock_output_count is not numeric. pam_faillock_output_count: '$deny'
+ERROR: Please report this bug.
+" >&2
+   exit 0
+fi
+
 ## Do not count the first two informational textual output lines (starting with "user:" and "When") if present,
 failed_login_counter=$(( pam_faillock_output_count - 2 ))
 

From 0801b96ae74256f36dcf8757d0ba8abc66ea0b9b Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:25:49 -0400
Subject: [PATCH 12/22] output

---
 usr/libexec/security-misc/pam-info | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index cf50d2a..d0210d9 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -124,7 +124,7 @@ fi
 #       if [ "$grep_result" = "" ]; then
 #          printf '%s\n' "\
 # $0: ERROR: Root login is disabled.
-# ERROR: This is because /etc/securetty is empty.
+# ERROR: This is because file '/etc/securetty' is empty.
 # See also:
 # https://www.kicksecure.com/wiki/root#login
 # " >&2
@@ -192,7 +192,7 @@ pam_faillock_output_count="$(printf '%s\n' "$pam_faillock_output" | wc -l)"
 
 if [[ "$deny" == *[!0-9]* ]]; then
    printf '%s\n' "\
-$0: ERROR: Variable pam_faillock_output_count is not numeric. pam_faillock_output_count: '$deny'
+$0: ERROR: Variable 'pam_faillock_output_count' is not numeric. pam_faillock_output_count: '$deny'
 ERROR: Please report this bug.
 " >&2
    exit 0
@@ -228,7 +228,7 @@ fi
 
 if [[ "$deny" == *[!0-9]* ]]; then
    printf '%s\n' "\
-$0: ERROR: deny is not numeric. deny: '$deny'
+$0: ERROR: Variable 'deny' is not numeric. deny: '$deny'
 ERROR: Please report this bug.
 " >&2
    exit 0

From 2c1abb23e03cfe449347ba692d35f5ba1f33cff4 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:26:46 -0400
Subject: [PATCH 13/22] output

---
 usr/libexec/security-misc/pam-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index d0210d9..d39738d 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -253,7 +253,7 @@ https://www.kicksecure.com/wiki/root#unlock
 fi
 
 printf '%s\n' "\
-$0: WARNING: $failed_login_counter failed login attempts for user_name '$user_name'.
+$0: WARNING: $failed_login_counter failed login attempts for account '$user_name'.
 Login will be blocked after $deny attempts.
 You have $remaining_attempts more attempts before unlock procedure is required.
 " >&2

From 92d3a36a0f43615db622c6b0daa7064b8e8ebbbb Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:29:01 -0400
Subject: [PATCH 14/22] fix

---
 usr/libexec/security-misc/pam-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index d39738d..49b959d 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -206,7 +206,7 @@ failed_login_counter=$(( pam_faillock_output_count - 2 ))
 
 ## Ensuring failed_login_counter is not set to a negative value.
 ## https://github.com/Kicksecure/security-misc/pull/305
-if [ "$failed_login_counter" -le "0" ]; then
+if [ "$failed_login_counter" -lt "0" ]; then
    true "$0: WARNING: Failed login counter is negative. Resetting to 0."
    failed_login_counter=0
 fi

From aa905fc8875c5c56351f10f4e40e6d2a7dd6d918 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:32:16 -0400
Subject: [PATCH 15/22] further validation of output of `faillock`

---
 usr/libexec/security-misc/pam-info | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 49b959d..d0fec69 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -184,6 +184,14 @@ user_name="$(printf '%s\n' "$pam_faillock_output_first_line" | str_replace ":" "
 ## user
 ## root
 
+if [ "$PAM_USER" != "$user_name" ]; then
+   printf '%s\n' "\
+$0: ERROR: Variable 'PAM_USER' '$PAM_USER' does not match variable 'user_name' '$user_name'.
+ERROR: Please report this bug.
+" >&2
+   exit 1
+fi
+
 pam_faillock_output_count="$(printf '%s\n' "$pam_faillock_output" | wc -l)"
 ## example pam_faillock_output_count:
 ## 2

From d7643954d184846c8b7fb5eda7200779126274eb Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:33:50 -0400
Subject: [PATCH 16/22] minor

---
 usr/libexec/security-misc/pam-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index d0fec69..f59c3f6 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -242,7 +242,7 @@ ERROR: Please report this bug.
    exit 0
 fi
 
-remaining_attempts="$(( $deny - $failed_login_counter ))"
+remaining_attempts="$(( deny - failed_login_counter ))"
 
 if [ "$remaining_attempts" -le "0" ]; then
    printf '%s\n' "\

From f086787464191a07e028dd92649c48b145023858 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:35:23 -0400
Subject: [PATCH 17/22] fix

---
 usr/libexec/security-misc/pam-info | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index f59c3f6..cb42e48 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -22,6 +22,7 @@ true "$0: START PHASE 2"
 set -o errexit
 set -o errtrace
 set -o pipefail
+#set -o nounset
 
 error_handler() {
    exit_code="$?"
@@ -198,9 +199,9 @@ pam_faillock_output_count="$(printf '%s\n' "$pam_faillock_output" | wc -l)"
 ## example pam_faillock_output_count:
 ## 4
 
-if [[ "$deny" == *[!0-9]* ]]; then
+if [[ "$pam_faillock_output_count" == *[!0-9]* ]]; then
    printf '%s\n' "\
-$0: ERROR: Variable 'pam_faillock_output_count' is not numeric. pam_faillock_output_count: '$deny'
+$0: ERROR: Variable 'pam_faillock_output_count' is not numeric. pam_faillock_output_count: '$pam_faillock_output_count'
 ERROR: Please report this bug.
 " >&2
    exit 0

From f023651c984c52a997bc241f99f118255cf60809 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:35:37 -0400
Subject: [PATCH 18/22] nounset

---
 usr/libexec/security-misc/pam-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index cb42e48..877b602 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -22,7 +22,7 @@ true "$0: START PHASE 2"
 set -o errexit
 set -o errtrace
 set -o pipefail
-#set -o nounset
+set -o nounset
 
 error_handler() {
    exit_code="$?"

From a969fa350e28ca296966509821a7c62b68f09a5a Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:40:27 -0400
Subject: [PATCH 19/22] fix

---
 usr/libexec/security-misc/pam-info | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 877b602..3ef81d0 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -46,9 +46,14 @@ https://github.com/rspamd/rspamd/issues/5137" >&2
   exit 1
 fi
 
+command -v pam_faillock_output &>/dev/null
+
 ## Named constants.
 pam_faillock_state_dir="/var/lib/security-misc/faillock"
 
+[[ -v PAM_USER ]] || PAM_USER=""
+[[ -v SUDO_USER ]] || SUDO_USER=""
+
 ## Debugging.
 who_ami="$(whoami)"
 true "$0: who_ami: $who_ami"
@@ -72,6 +77,7 @@ if [ ! "$grep_result" = "" ]; then
 
       ## https://forums.whonix.org/t/etc-security-hardening-console-lockdown/8592
 
+      console_allowed=""
       if id --name --groups --zero -- "$PAM_USER" | grep --quiet --null-data --line-regexp --fixed-strings -- "console"; then
          console_allowed=true
       fi

From 142ea2118989faddafa17db48efed379c4ac3f45 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 12:42:16 -0400
Subject: [PATCH 20/22] fix

---
 usr/libexec/security-misc/pam-info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/libexec/security-misc/pam-info b/usr/libexec/security-misc/pam-info
index 3ef81d0..a42effa 100755
--- a/usr/libexec/security-misc/pam-info
+++ b/usr/libexec/security-misc/pam-info
@@ -46,7 +46,7 @@ https://github.com/rspamd/rspamd/issues/5137" >&2
   exit 1
 fi
 
-command -v pam_faillock_output &>/dev/null
+command -v str_replace &>/dev/null
 
 ## Named constants.
 pam_faillock_state_dir="/var/lib/security-misc/faillock"

From ace45d7c95ed6b83c1897f76da5af4a0c97cab10 Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 21 May 2025 22:06:02 +0000
Subject: [PATCH 21/22] bumped changelog version

---
 changelog.upstream | 72 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog   |  6 ++++
 2 files changed, 78 insertions(+)

diff --git a/changelog.upstream b/changelog.upstream
index 8b19816..fa55e48 100644
--- a/changelog.upstream
+++ b/changelog.upstream
@@ -1,3 +1,75 @@
+commit 142ea2118989faddafa17db48efed379c4ac3f45
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:42:16 2025 -0400
+
+    fix
+
+commit a969fa350e28ca296966509821a7c62b68f09a5a
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:40:27 2025 -0400
+
+    fix
+
+commit f023651c984c52a997bc241f99f118255cf60809
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:35:37 2025 -0400
+
+    nounset
+
+commit f086787464191a07e028dd92649c48b145023858
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:35:23 2025 -0400
+
+    fix
+
+commit d7643954d184846c8b7fb5eda7200779126274eb
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:33:50 2025 -0400
+
+    minor
+
+commit aa905fc8875c5c56351f10f4e40e6d2a7dd6d918
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:32:16 2025 -0400
+
+    further validation of output of `faillock`
+
+commit 92d3a36a0f43615db622c6b0daa7064b8e8ebbbb
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:29:01 2025 -0400
+
+    fix
+
+commit 2c1abb23e03cfe449347ba692d35f5ba1f33cff4
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:26:46 2025 -0400
+
+    output
+
+commit 0801b96ae74256f36dcf8757d0ba8abc66ea0b9b
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:25:49 2025 -0400
+
+    output
+
+commit ef8515ba82996b137c386eeb91e6f853d58a515f
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:23:45 2025 -0400
+
+    improve error handling
+
+commit 784867e24b4d6f2899fa9b215ec9e3c4e2fb9d84
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 12:21:45 2025 -0400
+
+    fix
+
+commit 0eea681ce893a259563f8e9d5a2ec9722fbc635d
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 15:52:16 2025 +0000
+
+    bumped changelog version
+
 commit e1bae1c68aabc424924b6386fe4980d657dc2cdf
 Author: Patrick Schleizer <adrelanos@whonix.org>
 Date:   Wed May 21 11:50:59 2025 -0400
diff --git a/debian/changelog b/debian/changelog
index 886323c..4507e57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+security-misc (3:45.7-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Wed, 21 May 2025 22:06:01 +0000
+
 security-misc (3:45.6-1) unstable; urgency=medium
 
   * New upstream version (local package).

From abb2207313810966dad381c3a9f637c445a5834d Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@whonix.org>
Date: Tue, 27 May 2025 15:51:50 +0000
Subject: [PATCH 22/22] bumped changelog version

---
 changelog.upstream | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/changelog   |  6 ++++++
 2 files changed, 54 insertions(+)

diff --git a/changelog.upstream b/changelog.upstream
index fa55e48..bc31fbb 100644
--- a/changelog.upstream
+++ b/changelog.upstream
@@ -1,3 +1,25 @@
+commit 45016146f7c77d383f2254d19dc66ba9b883b8f2
+Merge: ace45d7 395169f
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Tue May 27 11:03:23 2025 -0400
+
+    Merge remote-tracking branch 'github-kicksecure/master'
+
+commit 395169fbce1854bfed727d1784f4e5c0d8e7c6ff
+Merge: ace45d7 e14b81b
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Tue May 27 10:58:50 2025 -0400
+
+    Merge pull request #308 from maybebyte/permission-hardener-speedboost
+    
+    perf(permission-hardener): optimize string match
+
+commit ace45d7c95ed6b83c1897f76da5af4a0c97cab10
+Author: Patrick Schleizer <adrelanos@whonix.org>
+Date:   Wed May 21 22:06:02 2025 +0000
+
+    bumped changelog version
+
 commit 142ea2118989faddafa17db48efed379c4ac3f45
 Author: Patrick Schleizer <adrelanos@whonix.org>
 Date:   Wed May 21 12:42:16 2025 -0400
@@ -116,6 +138,32 @@ Date:   Wed May 21 06:55:09 2025 -0400
 
     pam-info: fix, consistently write errors and warnings to stderr
 
+commit e14b81b15e479afbc4820a2b9bb60f3cf65bfb12
+Author: Ashlen <dev@anthes.is>
+Date:   Tue May 20 21:34:03 2025 -0600
+
+    perf(permission-hardener): optimize string match
+    
+    Replace subprocess grep calls with bash substring matching in
+    check_nosuid_whitelist function. This eliminates ~10k unneeded
+    subprocess spawns that were causing significant performance
+    degradation.
+    
+    In testing, it improves overall script execution speed by an
+    order of magnitude:
+    
+    Before patch:
+    $ sudo hyperfine -- './permission-hardener enable'
+    Benchmark 1: ./permission-hardener enable
+      Time (mean ± σ):     11.906 s ±  0.974 s    [User: 3.639 s, System: 8.728 s]
+      Range (min … max):   10.430 s … 14.090 s    10 runs
+    
+    After patch:
+    $ sudo hyperfine -- './permission-hardener enable'
+    Benchmark 1: ./permission-hardener enable
+      Time (mean ± σ):     802.8 ms ± 178.5 ms    [User: 283.0 ms, System: 471.9 ms]
+      Range (min … max):   639.4 ms … 1092.3 ms    10 runs
+
 commit 19d7e1af5d7acf6eb3a20fe3ebf5f14cef041f92
 Author: Patrick Schleizer <adrelanos@whonix.org>
 Date:   Tue May 20 11:40:27 2025 +0000
diff --git a/debian/changelog b/debian/changelog
index 4507e57..d86926c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+security-misc (3:45.8-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@whonix.org>  Tue, 27 May 2025 15:51:50 +0000
+
 security-misc (3:45.7-1) unstable; urgency=medium
 
   * New upstream version (local package).