Add detection and documentation for Apparmor restrictions

NVIDIA · May 8, 2024 · bb49d3e · bb49d3e
1 parent ccd3210
commit bb49d3e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/doc/requirements.md b/doc/requirements.md
@@ -47,6 +47,9 @@ The following kernel settings must be set accordingly:
 * On some distributions (e.g. Archlinux-based, Debian-based)
   - `/proc/sys/kernel/unprivileged_userns_clone` must be enabled (equal to 1)
 
+* On some distributions (e.g. Ubuntu-based)
+  - `/proc/sys/kernel/apparmor_restrict_unprivileged_userns` might need to be disabled (equal to 0) unless `{datadir}/enroot/apparmor.profile` is installed
+
 ## GPU support (optional)
 
 * GPU architecture > 2.1 (Fermi)

diff --git a/src/bundle.sh b/src/bundle.sh
@@ -119,27 +119,27 @@ bundle::verify() {
     printf "\n%s\n\n" "$(common::fmt bold "Kernel configuration:")"
     for param in CONFIG_NAMESPACES CONFIG_USER_NS CONFIG_SECCOMP_FILTER; do
         if zgrep -q "${param}=y" "${conf}"; then
-            printf "%-34s: %s\n" "${param}" "$(common::fmt green "OK")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt green "OK")"
         elif zgrep -q "${param}=m" "${conf}"; then
-            printf "%-34s: %s\n" "${param}" "$(common::fmt green "OK (module)")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt green "OK (module)")"
         else
-            printf "%-34s: %s\n" "${param}" "$(common::fmt red "KO")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt red "KO")"
         fi
     done
     for param in CONFIG_OVERLAY_FS; do
         if zgrep -q "${param}=y" "${conf}"; then
-            printf "%-34s: %s\n" "${param}" "$(common::fmt green "OK")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt green "OK")"
         elif zgrep -q "${param}=m" "${conf}"; then
-            printf "%-34s: %s\n" "${param}" "$(common::fmt green "OK (module)")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt green "OK (module)")"
         else
-            printf "%-34s: %s\n" "${param}" "$(common::fmt yellow "KO (optional)")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt yellow "KO (optional)")"
         fi
     done
     for param in CONFIG_X86_VSYSCALL_EMULATION CONFIG_VSYSCALL_EMULATE CONFIG_VSYSCALL_NATIVE; do
         if zgrep -q "${param}=y" "${conf}"; then
-            printf "%-34s: %s\n" "${param}" "$(common::fmt green "OK")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt green "OK")"
         else
-            printf "%-34s: %s\n" "${param}" "$(common::fmt yellow "KO (required if glibc <= 2.13)")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt yellow "KO (required if glibc <= 2.13)")"
         fi
     done
 
@@ -148,36 +148,43 @@ bundle::verify() {
     centos7*|rhel7*|ol7*)
         for param in "namespace.unpriv_enable=1" "user_namespace.enable=1"; do
             if grep -q "${param}" /proc/cmdline; then
-                printf "%-34s: %s\n" "${param}" "$(common::fmt green "OK")"
+                printf "%-45s: %s\n" "${param}" "$(common::fmt green "OK")"
             else
-                printf "%-34s: %s\n" "${param}" "$(common::fmt red "KO")"
+                printf "%-45s: %s\n" "${param}" "$(common::fmt red "KO")"
             fi
         done
     esac
     for param in "vsyscall=native" "vsyscall=emulate"; do
         if grep -q "${param}" /proc/cmdline; then
-            printf "%-34s: %s\n" "${param}" "$(common::fmt green "OK")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt green "OK")"
         else
-            printf "%-34s: %s\n" "${param}" "$(common::fmt yellow "KO (required if glibc <= 2.13)")"
+            printf "%-45s: %s\n" "${param}" "$(common::fmt yellow "KO (required if glibc <= 2.13)")"
         fi
     done
 
     printf "\n%s\n\n" "$(common::fmt bold "Kernel parameters:")"
     for param in "kernel/unprivileged_userns_clone" "user/max_user_namespaces" "user/max_mnt_namespaces"; do
         if [ -f "/proc/sys/${param}" ]; then
             if [ "$(< /proc/sys/${param})" -gt 0 ]; then
-                printf "%-34s: %s\n" "${param/\//.}" "$(common::fmt green "OK")"
+                printf "%-45s: %s\n" "${param/\//.}" "$(common::fmt green "OK")"
             else
-                printf "%-34s: %s\n" "${param/\//.}" "$(common::fmt red "KO")"
+                printf "%-45s: %s\n" "${param/\//.}" "$(common::fmt red "KO")"
             fi
         fi
     done
+    param="kernel/apparmor_restrict_unprivileged_userns"; if [ -f "/proc/sys/${param}" ]; then
+        if [ "$(< /proc/sys/${param})" -eq 0 ]; then
+            printf "%-45s: %s\n" "${param/\//.}" "$(common::fmt green "OK")"
+        else
+            printf "%-45s: %s\n" "${param/\//.}" "$(common::fmt yellow "KO (required w/o apparmor profile)")"
+        fi
+    fi
 
     printf "\n%s\n\n" "$(common::fmt bold "Extra packages:")"
     if command -v "nvidia-container-cli" > /dev/null; then
-        printf "%-34s: %s\n" "nvidia-container-cli" "$(common::fmt green "OK")"
+        printf "%-45s: %s\n" "nvidia-container-cli" "$(common::fmt green "OK")"
     else
-        printf "%-34s: %s\n" "nvidia-container-cli" "$(common::fmt yellow "KO (required for GPU support)")"
+        printf "%-45s: %s\n" "nvidia-container-cli" "$(common::fmt yellow "KO (required for GPU support)")"
     fi
 
     exit 0