summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-11-12 23:52:18 +0100
committerLudovic Courtès <ludo@gnu.org>2017-11-12 23:53:12 +0100
commit856b68bda959638201182304ded2759c7de5411b (patch)
tree1aeb3276c4c6a169fa89c1d461c10419806d0f2f
parentd0b87779f0a104b4b926a8290ed362c5b8e05cf6 (diff)
list-runtime-roots: Ignore PIDs we cannot access.
This allows running as non-root. Fixes a regression introduced in b8f59cdc20e9d83ce63523ef917e95fcee07f134. * nix/scripts/list-runtime-roots.in (referenced-files): Handle EACCES in addition to ENOENT.
-rw-r--r--nix/scripts/list-runtime-roots.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/nix/scripts/list-runtime-roots.in b/nix/scripts/list-runtime-roots.in
index 001d25c577..511789a539 100644
--- a/nix/scripts/list-runtime-roots.in
+++ b/nix/scripts/list-runtime-roots.in
@@ -119,10 +119,11 @@ or the empty list."
(proc-maps-roots proc)
(proc-environ-roots proc)))
(lambda args
- ;; There's a TOCTTOU race that we need to handle.
- (if (= ENOENT (system-error-errno args))
- '()
- (apply throw args))))))
+ (let ((err (system-error-errno args)))
+ (if (or (= ENOENT err) ;TOCTTOU race
+ (= EACCES err)) ;not running as root
+ '()
+ (apply throw args)))))))
(scandir %proc-directory string->number
(lambda (a b)
(< (string->number a) (string->number b))))))