Skip to content

Commit

Permalink
Match VT device paths to be blocked from mounting exactly
Browse files Browse the repository at this point in the history
As @mheon pointed out in PR #17055[^1], isVirtualConsoleDevice() does
not only matches VT device paths but also devices named like
/dev/tty0abcd.
This causes that non VT device paths named /dev/tty[0-9]+[A-Za-z]+ are
not mounted into privileged container and systemd containers accidentally.

This is an unlikely issue because the Linux kernel does not use device
paths like that.
To make it failproof and prevent issues in unlikely scenarios, change
isVirtualConsoleDevice() to exactly match ^/dev/tty[0-9]+$ paths.

Because it is not possible to match this path exactly with Glob syntax,
the path is now checked with strings.TrimPrefix() and
strconv.ParseUint().
ParseUint uses a bitsize of 16, this is sufficient because the max
number of TTY devices is 512 in Linux 6.1.5.
(Checked via 'git grep -e '#define' --and -e 'TTY_MINORS').

The commit also adds a unit-test for isVirtualConsoleDevice().

Fixes: f4c81b0 ("Only prevent VTs to be mounted inside...")

[^1]: #17055 (comment)

Signed-off-by: Fabian Holler <mail@fholler.de>
  • Loading branch information
fho committed Jan 18, 2023
1 parent a702d44 commit 9ae828d
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 10 deletions.
24 changes: 14 additions & 10 deletions pkg/util/utils_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"fmt"
"io/fs"
"os"
"path"
"path/filepath"
"strconv"
"strings"
"syscall"

"github.com/containers/podman/v4/libpod/define"
Expand Down Expand Up @@ -70,20 +71,23 @@ func FindDeviceNodes() (map[string]string, error) {
return nodes, nil
}

func isVirtualConsoleDevice(device string) bool {
// isVirtualConsoleDevice returns true if path is a virtual console device
// (/dev/tty\d+).
// The passed path must be clean (filepath.Clean).
func isVirtualConsoleDevice(path string) bool {
/*
Virtual consoles are of the form `/dev/tty\d+`, any other device such as
/dev/tty, ttyUSB0, or ttyACM0 should not be matched.
See `man 4 console` for more information.
NOTE: Matching is done using path.Match even though a regular expression
would have been more accurate. This is because a regular
expression would have required pre-compilation, which would have
increase the startup time needlessly or made the code more complex
than needed.
*/
matched, _ := path.Match("/dev/tty[0-9]*", device)
return matched
suffix := strings.TrimPrefix(path, "/dev/tty")
if suffix == path || suffix == "" {
return false
}

// 16bit because, max. supported TTY devices is 512 in Linux 6.1.5.
_, err := strconv.ParseUint(suffix, 10, 16)
return err == nil
}

func AddPrivilegedDevices(g *generate.Generator, systemdMode bool) error {
Expand Down
63 changes: 63 additions & 0 deletions pkg/util/utils_linux_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package util

import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestGetImageConfigStopSignal(t *testing.T) {
// Linux-only because parsing signal names is not supported on non-Linux systems by
// pkg/signal.
stopSignalValidInt, err := GetImageConfig([]string{"STOPSIGNAL 9"})
require.Nil(t, err)
assert.Equal(t, stopSignalValidInt.StopSignal, "9")

stopSignalValidString, err := GetImageConfig([]string{"STOPSIGNAL SIGKILL"})
require.Nil(t, err)
assert.Equal(t, stopSignalValidString.StopSignal, "9")

_, err = GetImageConfig([]string{"STOPSIGNAL 0"})
assert.NotNil(t, err)

_, err = GetImageConfig([]string{"STOPSIGNAL garbage"})
assert.NotNil(t, err)

_, err = GetImageConfig([]string{"STOPSIGNAL "})
assert.NotNil(t, err)
}

func TestIsVirtualConsoleDevice(t *testing.T) {
testcases := []struct {
expectedResult bool
path string
}{
{
expectedResult: true,
path: "/dev/tty10",
},
{
expectedResult: false,
path: "/dev/tty",
},
{
expectedResult: false,
path: "/dev/ttyUSB0",
},

{
expectedResult: false,
path: "/dev/tty0abcd",
},
}

for _, tc := range testcases {
t.Run(tc.path, func(t *testing.T) {
result := isVirtualConsoleDevice(tc.path)
if result != tc.expectedResult {
t.Errorf("isVirtualConsoleDevice returned %t, expected %t", result, tc.expectedResult)
}
})
}
}

0 comments on commit 9ae828d

Please sign in to comment.