From 9471c013483b0709479c51d470ac840621ae7d46 Mon Sep 17 00:00:00 2001 From: Jamie Liu Date: Mon, 8 Apr 2019 16:31:06 -0700 Subject: Export kernel.SignalInfoPriv. Also add kernel.SignalInfoNoInfo, and use it in RLIMIT_FSIZE checks. PiperOrigin-RevId: 242562428 Change-Id: I4887c0e1c8f5fddcabfe6d4281bf76d2f2eafe90 --- pkg/sentry/kernel/fasync/BUILD | 1 - pkg/sentry/kernel/fasync/fasync.go | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'pkg/sentry/kernel/fasync') diff --git a/pkg/sentry/kernel/fasync/BUILD b/pkg/sentry/kernel/fasync/BUILD index 5faf95909..59b4a49e1 100644 --- a/pkg/sentry/kernel/fasync/BUILD +++ b/pkg/sentry/kernel/fasync/BUILD @@ -9,7 +9,6 @@ go_library( visibility = ["//:sandbox"], deps = [ "//pkg/abi/linux", - "//pkg/sentry/arch", "//pkg/sentry/fs", "//pkg/sentry/kernel", "//pkg/sentry/kernel/auth", diff --git a/pkg/sentry/kernel/fasync/fasync.go b/pkg/sentry/kernel/fasync/fasync.go index aa4aac109..298d988ea 100644 --- a/pkg/sentry/kernel/fasync/fasync.go +++ b/pkg/sentry/kernel/fasync/fasync.go @@ -19,7 +19,6 @@ import ( "sync" "gvisor.googlesource.com/gvisor/pkg/abi/linux" - "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/sentry/kernel/auth" @@ -72,11 +71,7 @@ func (a *FileAsync) Callback(e *waiter.Entry) { a.requester.EffectiveKUID == c.RealKUID || a.requester.RealKUID == c.SavedKUID || a.requester.RealKUID == c.RealKUID { - t.SendSignal(&arch.SignalInfo{ - Signo: int32(linux.SIGIO), - // SEND_SIG_PRIV - Code: arch.SignalInfoKernel, - }) + t.SendSignal(kernel.SignalInfoPriv(linux.SIGIO)) } a.mu.Unlock() } -- cgit v1.2.3