Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cgroup: devices: major cleanups and minimal transition rules #2391

Merged
merged 10 commits into from
May 14, 2020
Merged

cgroup: devices: major cleanups and minimal transition rules #2391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a79fa7c
contrib: recvtty: add --no-stdin flag
cyphar May 9, 2020
859a780
cgroups: add GetFreezerState() helper to Manager
cyphar May 11, 2020
b2bec98
cgroup: devices: eradicate the Allow/Deny lists
cyphar May 4, 2020
60e21ec
specconv: remove default /dev/console access
cyphar May 4, 2020
24388be
configs: use different types for .Devices and .Resources.Devices
cyphar May 7, 2020
2353ffe
cgroups: implement a devices cgroupv1 emulator
cyphar May 7, 2020
afe8348
cgroupv1: devices: use minimal transition rules with devices.Emulator
cyphar May 8, 2020
b810da1
cgroups: systemd: make use of Device*= properties
cyphar May 10, 2020
4438eaa
tests: add integration test for devices transition rules
cyphar May 9, 2020
ba6eb28
tests: add integration test for paused-and-updated containers
cyphar May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions contrib/cmd/recvtty/recvtty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func bail(err error) {
os.Exit(1)
}

func handleSingle(path string) error {
func handleSingle(path string, noStdin bool) error {
// Open a socket.
ln, err := net.Listen("unix", path)
if err != nil {
Expand Down Expand Up @@ -113,10 +113,12 @@ func handleSingle(path string) error {
io.Copy(os.Stdout, c)
quitChan <- struct{}{}
}()
go func() {
io.Copy(c, os.Stdin)
quitChan <- struct{}{}
}()
if !noStdin {
go func() {
io.Copy(c, os.Stdin)
quitChan <- struct{}{}
}()
}

// Only close the master fd once we've stopped copying.
<-quitChan
Expand Down Expand Up @@ -201,6 +203,10 @@ func main() {
Value: "",
Usage: "Path to write daemon process ID to",
},
cli.BoolFlag{
Name: "no-stdin",
Usage: "Disable stdin handling (no-op for null mode)",
},
}

app.Action = func(ctx *cli.Context) error {
Expand All @@ -218,9 +224,10 @@ func main() {
}
}

noStdin := ctx.Bool("no-stdin")
switch ctx.String("mode") {
case "single":
if err := handleSingle(path); err != nil {
if err := handleSingle(path, noStdin); err != nil {
return err
}
case "null":
Expand Down
5 changes: 2 additions & 3 deletions libcontainer/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ config := &configs.Config{
Parent: "system",
Resources: &configs.Resources{
MemorySwappiness: nil,
AllowAllDevices: nil,
AllowedDevices: configs.DefaultAllowedDevices,
Devices: specconv.AllowedDevices,
},
},
MaskPaths: []string{
Expand All @@ -166,7 +165,7 @@ config := &configs.Config{
ReadonlyPaths: []string{
"/proc/sys", "/proc/sysrq-trigger", "/proc/irq", "/proc/bus",
},
Devices: configs.DefaultAutoCreatedDevices,
Devices: specconv.AllowedDevices,
Hostname: "testing",
Mounts: []*configs.Mount{
{
Expand Down
3 changes: 3 additions & 0 deletions libcontainer/cgroups/cgroups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ type Manager interface {

// GetCgroups returns the cgroup data as configured.
GetCgroups() (*configs.Cgroup, error)

// GetFreezerState retrieves the current FreezerState of the cgroup.
GetFreezerState() (configs.FreezerState, error)
}

type NotFoundError struct {
Expand Down
Loading