netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup remaining comments for #1624.

Browse Source 
Fixes #1624

PiperOrigin-RevId: 492292937
This commit is contained in:
Ayush Ranjan
2022-12-01 14:01:37 -08:00
committed by gVisor bot
parent 0bb834f4e2
commit 9c444c44e0
5 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/fsimpl/lock/lock.go
-8
View File
@@ -164,14 +164,6 @@ func (l *Locks) LockRegion(ctx context.Context, uid UniqueID, ownerPID int32, t
}
}
// LockRegionVFS1 is a wrapper around LockRegion for VFS1, which does not implement
// F_GETLK (and does not care about storing PIDs as a result).
//
// TODO(gvisor.dev/issue/1624): Delete.
func (l *Locks) LockRegionVFS1(ctx context.Context, uid UniqueID, t LockType, r LockRange, block bool) error {
return l.LockRegion(ctx, uid, 0 /* ownerPID */, t, r, block)
}
// Readiness always returns zero.
func (l *Locks) Readiness(waiter.EventMask) waiter.EventMask {
return 0
pkg/sentry/syscalls/linux/points.go
+1 -1
View File
@@ -691,7 +691,7 @@ func signalfdHelper(t *kernel.Task, fields seccheck.FieldSet, cxtData *pb.Contex
}
sigset := info.Args[1].Pointer()
sigsetsize := info.Args[2].SizeT()
mask, err := CopyInSigSet(t, sigset, sigsetsize)
mask, err := copyInSigSet(t, sigset, sigsetsize)
if err == nil { // if NO error
p.Sigset = uint64(mask)
p.Sigset = uint64(mask)
pkg/sentry/syscalls/linux/sigset.go
+2 -6
View File
@@ -21,13 +21,9 @@ import (
"gvisor.dev/gvisor/pkg/sentry/kernel"
)
// CopyInSigSet copies in a sigset_t, checks its size, and ensures that KILL and
// copyInSigSet copies in a sigset_t, checks its size, and ensures that KILL and
// STOP are clear.
//
// TODO(gvisor.dev/issue/1624): This is only exported because
// syscalls/vfs2/signal.go depends on it. Once vfs1 is deleted and the vfs2
// syscalls are moved into this package, then they can be unexported.
func CopyInSigSet(t *kernel.Task, sigSetAddr hostarch.Addr, size uint) (linux.SignalSet, error) {
func copyInSigSet(t *kernel.Task, sigSetAddr hostarch.Addr, size uint) (linux.SignalSet, error) {
if size != linux.SignalSetSize {
return 0, linuxerr.EINVAL
}
pkg/sentry/syscalls/linux/sys_signal.go
+3 -3
View File
@@ -295,7 +295,7 @@ func RtSigprocmask(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel
}
oldmask := t.SignalMask()
if setaddr != 0 {
mask, err := CopyInSigSet(t, setaddr, sigsetsize)
mask, err := copyInSigSet(t, setaddr, sigsetsize)
if err != nil {
return 0, nil, err
}
@@ -365,7 +365,7 @@ func RtSigtimedwait(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kerne
timespec := args[2].Pointer()
sigsetsize := args[3].SizeT()
mask, err := CopyInSigSet(t, sigset, sigsetsize)
mask, err := copyInSigSet(t, sigset, sigsetsize)
if err != nil {
return 0, nil, err
}
@@ -517,7 +517,7 @@ func RestartSyscall(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kerne
// sharedSignalfd is shared between the two calls.
func sharedSignalfd(t *kernel.Task, fd int32, sigset hostarch.Addr, sigsetsize uint, flags int32) (uintptr, *kernel.SyscallControl, error) {
// Copy in the signal mask.
mask, err := CopyInSigSet(t, sigset, sigsetsize)
mask, err := copyInSigSet(t, sigset, sigsetsize)
if err != nil {
return 0, nil, err
}
test/runtimes/runner/lib/lib.go
-3
View File
@@ -65,9 +65,6 @@ type Filter func(test string) bool
// defered functions before exiting. It returns an exit code that should be
// passed to os.Exit.
func RunTests(lang, image string, filter Filter, batchSize int, timeout time.Duration, proctorSettings ProctorSettings) int {
// TODO(gvisor.dev/issue/1624): Remove those tests from all exclude lists
// that only fail with VFS1.
// Construct the shared docker instance.
ctx := context.Background()
d := dockerutil.MakeContainer(ctx, testutil.DefaultLogger(lang))