Skip to content

vm: enable isolated System V IPC for sandboxed actions #41

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

Open
zbarsky-openai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

vm: enable isolated System V IPC for sandboxed actions #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/action_runner.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ inline fn runnerTimingNow(io: std.Io) std.Io.Timestamp {

fn actionNamespaceFlags() usize {
const linux = std.os.linux;
return linux.CLONE.NEWNS | linux.CLONE.NEWNET | linux.CLONE.NEWPID;
return linux.CLONE.NEWNS | linux.CLONE.NEWNET | linux.CLONE.NEWPID | linux.CLONE.NEWIPC;
}

fn actionCloneFlags() u32 {
Expand Down Expand Up @@ -1637,12 +1637,13 @@ test "ExecutionControl rejects a cancelled action" {
try std.testing.expectError(error.ExecutionCancelled, execution_control.check(std.testing.io));
}

test "action clone flags isolate mounts, networking, and action process IDs" {
test "action clone flags isolate mounts, networking, process IDs, and IPC" {
const linux = std.os.linux;
const flags = actionCloneFlags();
try std.testing.expect((flags & linux.CLONE.NEWNS) != 0);
try std.testing.expect((flags & linux.CLONE.NEWNET) != 0);
try std.testing.expect((flags & linux.CLONE.NEWPID) != 0);
try std.testing.expect((flags & linux.CLONE.NEWIPC) != 0);
try std.testing.expectEqual(@as(u32, @intFromEnum(linux.SIG.CHLD)), flags & linux.CSIGNAL);
}

Expand Down
2 changes: 2 additions & 0 deletions vm/linux.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ CONFIG_HYPERV_STORAGE=y
CONFIG_HYPERV_VMBUS=y
CONFIG_HYPERV_VSOCKETS=y
CONFIG_INET=y
CONFIG_IPC_NS=y
CONFIG_JBD2=y
CONFIG_KALLSYMS=y
CONFIG_MEMCG=y
Expand All @@ -61,6 +62,7 @@ CONFIG_SCSI_COMMON=y
CONFIG_SCSI_LOWLEVEL=y
CONFIG_SIGNALFD=y
CONFIG_SYSFS=y
CONFIG_SYSVIPC=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_ZSTD=y
CONFIG_TMPFS=y
Expand Down
2 changes: 2 additions & 0 deletions vm/linux_x86_64.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ CONFIG_FS_MBCACHE=y
# CONFIG_FUSE_FS is not set
CONFIG_FUTEX=y
CONFIG_INET=y
CONFIG_IPC_NS=y
CONFIG_JBD2=y
CONFIG_KALLSYMS=y
CONFIG_KERNEL_LZ4=y
Expand All @@ -54,6 +55,7 @@ CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SIGNALFD=y
CONFIG_SYSFS=y
CONFIG_SYSVIPC=y
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_ZSTD=y
CONFIG_TMPFS=y
Expand Down