Skip to content

FIX: don't let set -e abort on old bwrap/kernel version checks #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Thomas A Caswell (tacaswell) merged 1 commit into from
Jul 10, 2026
Merged

FIX: don't let set -e abort on old bwrap/kernel version checks #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/bwrap_sandbox_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ detect_bwrap_capabilities() {
# --clearenv: Start with an empty environment (added in 0.5.0)
# Fallback: manually unset all host env vars with --unsetenv
HAS_CLEARENV=0
_version_ge "${_bwrap_ver}" "0.5.0" && HAS_CLEARENV=1
if _version_ge "${_bwrap_ver}" "0.5.0"; then HAS_CLEARENV=1; fi

# Bind over ro-bind: ability to bind-mount on top of a read-only bind
# mount (e.g., masking /usr/bin/ssh after --ro-bind /usr /usr).
# This works in 0.6.3+; earlier versions fail with "Permission denied".
# Fallback: skip binary masking (security reduction — tools remain accessible)
HAS_BIND_OVER_RO=0
_version_ge "${_bwrap_ver}" "0.6.3" && HAS_BIND_OVER_RO=1
if _version_ge "${_bwrap_ver}" "0.6.3"; then HAS_BIND_OVER_RO=1; fi
}

# Detect kernel-level security features that affect bwrap argument choice.
Expand All @@ -154,7 +154,7 @@ detect_kernel_capabilities() {
_kver="${_kver%%-*}" # strip suffix e.g. "5.14.0-427.el9" -> "5.14.0"

KERNEL_HAS_TIOCSTI_CAP_GUARD=0
_version_ge "${_kver}" "5.14" && KERNEL_HAS_TIOCSTI_CAP_GUARD=1
if _version_ge "${_kver}" "5.14"; then KERNEL_HAS_TIOCSTI_CAP_GUARD=1; fi
}

detect_shell() {
Expand Down