opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2915 from giuseppe/rootless-do-not-block-sigtstp

Browse Source 
rootless: do not block SIGTSTP
This commit is contained in:
OpenShift Merge Robot
2019-04-13 03:07:48 -07:00
committed by GitHub
parent 852ca40665 814066ee3b
commit 37598ab896
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/rootless/rootless_linux.c
View File

@ -16,6 +16,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <dirent.h> #include <dirent.h>
#include <termios.h>
#include <sys/ioctl.h>
static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces"; static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone"; static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
@ -178,6 +180,11 @@ reexec_userns_join (int userns, int mountns)
_exit (EXIT_FAILURE); _exit (EXIT_FAILURE);
} }
if (isatty (1) && ioctl (1, TIOCSCTTY, 0) == -1) {
fprintf (stderr, "cannot ioctl(TIOCSCTTY): %s\n", strerror (errno));
_exit (EXIT_FAILURE);
}
if (setns (userns, 0) < 0) if (setns (userns, 0) < 0)
{ {
fprintf (stderr, "cannot setns: %s\n", strerror (errno)); fprintf (stderr, "cannot setns: %s\n", strerror (errno));

14
pkg/rootless/rootless_linux.go
View File

@ -28,6 +28,10 @@ extern int reexec_userns_join(int userns, int mountns);
*/ */
import "C" import "C"
const (
numSig = 65 // max number of signals
)
func runInUser() error { func runInUser() error {
os.Setenv("_CONTAINERS_USERNS_CONFIGURED", "done") os.Setenv("_CONTAINERS_USERNS_CONFIGURED", "done")
return nil return nil
@ -283,7 +287,15 @@ func BecomeRootInUserNS() (bool, int, error) {
c := make(chan os.Signal, 1) c := make(chan os.Signal, 1)
gosignal.Notify(c) signals := []os.Signal{}
for sig := 0; sig < numSig; sig++ {
if sig == int(syscall.SIGTSTP) {
continue
}
signals = append(signals, syscall.Signal(sig))
}
gosignal.Notify(c, signals...)
defer gosignal.Reset() defer gosignal.Reset()
go func() { go func() {
for s := range c { for s := range c {