mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 06:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

syscalls: Re-enable 'pivot-root' test.

Browse source 
Fixes <https://bugs.gnu.org/25476>.
Reported by Paul Garlick <pgarlick@tourbillion-technology.com>.

* tests/syscalls.scm ("pivot-root"): Skip only when
PERFORM-CONTAINER-TESTS? is true.  Rewrite to use a socket pair instead
of a pipe.  Synchronize parent and child so that the parent can
initialize the child's UID and GID mappings before continuing.
This commit is contained in:
Ludovic Courtès 2020-02-11 12:13:14 +01:00
parent 3d2f29382d
commit 1deca767be
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
tests/syscalls.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -161,29 +161,22 @@ (define perform-container-tests?
(waitpid fork-pid) (waitpid fork-pid)
result)))))))) result))))))))
;; XXX: Skip this test when running Linux > 4.7.5 to work around (when (not perform-container-tests?)
;; <https://bugzilla.kernel.org/show_bug.cgi?id=183461>.
(when (or (not perform-container-tests?)
(version>? (utsname:release (uname)) "4.7.5")
;; Skip on Ubuntu's 4.4 kernels, which contain a backport of the
;; faulty code: <https://bugs.gnu.org/25476>.
(member (utsname:release (uname))
'("4.4.0-21-generic" "4.4.0-59-generic"
"4.4.0-116-generic")))
(test-skip 1)) (test-skip 1))
(test-equal "pivot-root" (test-equal "pivot-root"
#t 'success!
(match (pipe) (match (socketpair AF_UNIX SOCK_STREAM 0)
((in . out) ((parent . child)
(match (clone (logior CLONE_NEWUSER CLONE_NEWNS SIGCHLD)) (match (clone (logior CLONE_NEWUSER CLONE_NEWNS SIGCHLD))
(0 (0
(dynamic-wind (dynamic-wind
(const #t) (const #t)
(lambda () (lambda ()
(close in) (close parent)
(call-with-temporary-directory (call-with-temporary-directory
(lambda (root) (lambda (root)
(display "ready\n" child)
(read child) ;wait for "go!"
(let ((put-old (string-append root "/real-root"))) (let ((put-old (string-append root "/real-root")))
(mount "none" root "tmpfs") (mount "none" root "tmpfs")
(mkdir put-old) (mkdir put-old)
@ -192,18 +185,32 @@ (define perform-container-tests?
(display "testing\n" port))) (display "testing\n" port)))
(pivot-root root put-old) (pivot-root root put-old)
;; The test file should now be located inside the root directory. ;; The test file should now be located inside the root directory.
(write (file-exists? "/test") out) (write (and (file-exists? "/test") 'success!) child)
(close out))))) (close child)))))
(lambda () (lambda ()
(primitive-exit 0)))) (primitive-exit 0))))
(pid (pid
(close out) (close child)
(let ((result (read in))) (match (read parent)
(close in) ('ready
(and (zero? (match (waitpid pid) ;; Set up the UID/GID mapping so that we can mkdir on the tmpfs:
((_ . status) ;; <https://bugzilla.kernel.org/show_bug.cgi?id=183461>.
(status:exit-val status)))) (call-with-output-file (format #f "/proc/~d/setgroups" pid)
(eq? #t result)))))))) (lambda (port)
(display "deny" port)))
(call-with-output-file (format #f "/proc/~d/uid_map" pid)
(lambda (port)
(format port "0 ~d 1" (getuid))))
(call-with-output-file (format #f "/proc/~d/gid_map" pid)
(lambda (port)
(format port "0 ~d 1" (getgid))))
(display "go!\n" parent)
(let ((result (read parent)))
(close parent)
(and (zero? (match (waitpid pid)
((_ . status)
(status:exit-val status))))
result)))))))))
(test-equal "scandir*, ENOENT" (test-equal "scandir*, ENOENT"
ENOENT ENOENT