diff options
author | Jamie Liu <jamieliu@google.com> | 2019-04-08 16:31:06 -0700 |
---|---|---|
committer | Shentubot <shentubot@google.com> | 2019-04-08 16:32:11 -0700 |
commit | 9471c013483b0709479c51d470ac840621ae7d46 (patch) | |
tree | 651bfe7529c28e69320dbe1c9540250e103ba5db /pkg/sentry/syscalls | |
parent | 218a7b54494b263001ed791ca13857c12d37ded6 (diff) |
Export kernel.SignalInfoPriv.
Also add kernel.SignalInfoNoInfo, and use it in RLIMIT_FSIZE checks.
PiperOrigin-RevId: 242562428
Change-Id: I4887c0e1c8f5fddcabfe6d4281bf76d2f2eafe90
Diffstat (limited to 'pkg/sentry/syscalls')
-rw-r--r-- | pkg/sentry/syscalls/linux/error.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/sentry/syscalls/linux/error.go b/pkg/sentry/syscalls/linux/error.go index 9fd002955..e86bed313 100644 --- a/pkg/sentry/syscalls/linux/error.go +++ b/pkg/sentry/syscalls/linux/error.go @@ -19,9 +19,9 @@ import ( "sync" "syscall" + "gvisor.googlesource.com/gvisor/pkg/abi/linux" "gvisor.googlesource.com/gvisor/pkg/log" "gvisor.googlesource.com/gvisor/pkg/metric" - "gvisor.googlesource.com/gvisor/pkg/sentry/arch" "gvisor.googlesource.com/gvisor/pkg/sentry/fs" "gvisor.googlesource.com/gvisor/pkg/sentry/kernel" "gvisor.googlesource.com/gvisor/pkg/syserror" @@ -53,10 +53,7 @@ func handleIOError(t *kernel.Task, partialResult bool, err, intr error, op strin // // Do not consume the error and return it as EFBIG. // Simultaneously send a SIGXFSZ per setrlimit(2). - t.SendSignal(&arch.SignalInfo{ - Signo: int32(syscall.SIGXFSZ), - Code: arch.SignalInfoKernel, - }) + t.SendSignal(kernel.SignalInfoNoInfo(linux.SIGXFSZ, t, t)) return syscall.EFBIG case syserror.ErrInterrupted: // The syscall was interrupted. Return nil if it completed |