Merge pull request #188 from dannf/proc-read-race

initramfs: Avoid noise due to /proc race
latchset · Apr 29, 2020 · e9fb467 · e9fb467
2 parents ecb5441 + e2fd826
commit e9fb467
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/initramfs-tools/scripts/local-top/clevis.in b/src/initramfs-tools/scripts/local-top/clevis.in
@@ -131,8 +131,9 @@ clevisloop() {
         done
 
         # Import CRYPTTAB_SOURCE from the askpass process.
-        local "$(tr '\0' '\n' < /proc/${pid}/environ | \
-	    grep '^CRYPTTAB_SOURCE=')"
+        local CRYPTTAB_SOURCE="$(cat /proc/${pid}/environ 2> /dev/null | \
+            tr '\0' '\n' | grep '^CRYPTTAB_SOURCE=' | cut -d= -f2)"
+        [ -n "$CRYPTTAB_SOURCE" ] || continue
 
         # Make sure that CRYPTTAB_SOURCE is actually a block device
         [ ! -b "$CRYPTTAB_SOURCE" ] && continue