Merge release-20210601.0-39-g9ede1a605 (automated)

4 files changed, 29 insertions, 29 deletions

diff --git a/pkg/sentry/syscalls/linux/sys_file.go b/pkg/sentry/syscalls/linux/sys_file.go
index 37443ab78..90a719ba2 100644
--- a/pkg/sentry/syscalls/linux/sys_file.go
+++ b/pkg/sentry/syscalls/linux/sys_file.go
@@ -1569,9 +1569,9 @@ func Truncate(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sysc
 	}
 
 	if uint64(length) >= t.ThreadGroup().Limits().Get(limits.FileSize).Cur {
-		t.SendSignal(&arch.SignalInfo{
+		t.SendSignal(&linux.SignalInfo{
 			Signo: int32(linux.SIGXFSZ),
-			Code:  arch.SignalInfoUser,
+			Code:  linux.SI_USER,
 		})
 		return 0, nil, syserror.EFBIG
 	}
@@ -1632,9 +1632,9 @@ func Ftruncate(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sys
 	}
 
 	if uint64(length) >= t.ThreadGroup().Limits().Get(limits.FileSize).Cur {
-		t.SendSignal(&arch.SignalInfo{
+		t.SendSignal(&linux.SignalInfo{
 			Signo: int32(linux.SIGXFSZ),
-			Code:  arch.SignalInfoUser,
+			Code:  linux.SI_USER,
 		})
 		return 0, nil, syserror.EFBIG
 	}
@@ -2140,9 +2140,9 @@ func Fallocate(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sys
 		return 0, nil, syserror.EFBIG
 	}
 	if uint64(size) >= t.ThreadGroup().Limits().Get(limits.FileSize).Cur {
-		t.SendSignal(&arch.SignalInfo{
+		t.SendSignal(&linux.SignalInfo{
 			Signo: int32(linux.SIGXFSZ),
-			Code:  arch.SignalInfoUser,
+			Code:  linux.SI_USER,
 		})
 		return 0, nil, syserror.EFBIG
 	}
diff --git a/pkg/sentry/syscalls/linux/sys_signal.go b/pkg/sentry/syscalls/linux/sys_signal.go
index 39a333215..27a7f7fe1 100644
--- a/pkg/sentry/syscalls/linux/sys_signal.go
+++ b/pkg/sentry/syscalls/linux/sys_signal.go
@@ -84,9 +84,9 @@ func Kill(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.SyscallC
 			if !mayKill(t, target, sig) {
 				return 0, nil, syserror.EPERM
 			}
-			info := &arch.SignalInfo{
+			info := &linux.SignalInfo{
 				Signo: int32(sig),
-				Code:  arch.SignalInfoUser,
+				Code:  linux.SI_USER,
 			}
 			info.SetPID(int32(target.PIDNamespace().IDOfTask(t)))
 			info.SetUID(int32(t.Credentials().RealKUID.In(target.UserNamespace()).OrOverflow()))
@@ -123,9 +123,9 @@ func Kill(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.SyscallC
 			// depend on the iteration order. We at least implement the
 			// semantics documented by the man page: "On success (at least
 			// one signal was sent), zero is returned."
-			info := &arch.SignalInfo{
+			info := &linux.SignalInfo{
 				Signo: int32(sig),
-				Code:  arch.SignalInfoUser,
+				Code:  linux.SI_USER,
 			}
 			info.SetPID(int32(tg.PIDNamespace().IDOfTask(t)))
 			info.SetUID(int32(t.Credentials().RealKUID.In(tg.Leader().UserNamespace()).OrOverflow()))
@@ -167,9 +167,9 @@ func Kill(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.SyscallC
 					continue
 				}
 
-				info := &arch.SignalInfo{
+				info := &linux.SignalInfo{
 					Signo: int32(sig),
-					Code:  arch.SignalInfoUser,
+					Code:  linux.SI_USER,
 				}
 				info.SetPID(int32(tg.PIDNamespace().IDOfTask(t)))
 				info.SetUID(int32(t.Credentials().RealKUID.In(tg.Leader().UserNamespace()).OrOverflow()))
@@ -184,10 +184,10 @@ func Kill(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.SyscallC
 	}
 }
 
-func tkillSigInfo(sender, receiver *kernel.Task, sig linux.Signal) *arch.SignalInfo {
-	info := &arch.SignalInfo{
+func tkillSigInfo(sender, receiver *kernel.Task, sig linux.Signal) *linux.SignalInfo {
+	info := &linux.SignalInfo{
 		Signo: int32(sig),
-		Code:  arch.SignalInfoTkill,
+		Code:  linux.SI_TKILL,
 	}
 	info.SetPID(int32(receiver.PIDNamespace().IDOfThreadGroup(sender.ThreadGroup())))
 	info.SetUID(int32(sender.Credentials().RealKUID.In(receiver.UserNamespace()).OrOverflow()))
@@ -409,7 +409,7 @@ func RtSigqueueinfo(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kerne
 	// We must ensure that the Signo is set (Linux overrides this in the
 	// same way), and that the code is in the allowed set. This same logic
 	// appears below in RtSigtgqueueinfo and should be kept in sync.
-	var info arch.SignalInfo
+	var info linux.SignalInfo
 	if _, err := info.CopyIn(t, infoAddr); err != nil {
 		return 0, nil, err
 	}
@@ -425,7 +425,7 @@ func RtSigqueueinfo(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kerne
 
 		// If the sender is not the receiver, it can't use si_codes used by the
 		// kernel or SI_TKILL.
-		if (info.Code >= 0 || info.Code == arch.SignalInfoTkill) && target != t {
+		if (info.Code >= 0 || info.Code == linux.SI_TKILL) && target != t {
 			return 0, nil, syserror.EPERM
 		}
 
@@ -453,7 +453,7 @@ func RtTgsigqueueinfo(t *kernel.Task, args arch.SyscallArguments) (uintptr, *ker
 	}
 
 	// Copy in the info. See RtSigqueueinfo above.
-	var info arch.SignalInfo
+	var info linux.SignalInfo
 	if _, err := info.CopyIn(t, infoAddr); err != nil {
 		return 0, nil, err
 	}
@@ -468,7 +468,7 @@ func RtTgsigqueueinfo(t *kernel.Task, args arch.SyscallArguments) (uintptr, *ker
 
 	// If the sender is not the receiver, it can't use si_codes used by the
 	// kernel or SI_TKILL.
-	if (info.Code >= 0 || info.Code == arch.SignalInfoTkill) && target != t {
+	if (info.Code >= 0 || info.Code == linux.SI_TKILL) && target != t {
 		return 0, nil, syserror.EPERM
 	}
 
diff --git a/pkg/sentry/syscalls/linux/sys_thread.go b/pkg/sentry/syscalls/linux/sys_thread.go
index 3185ea527..0d5056303 100644
--- a/pkg/sentry/syscalls/linux/sys_thread.go
+++ b/pkg/sentry/syscalls/linux/sys_thread.go
@@ -398,7 +398,7 @@ func Waitid(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Syscal
 			// out the fields it would set for a successful waitid in this case
 			// as well.
 			if infop != 0 {
-				var si arch.SignalInfo
+				var si linux.SignalInfo
 				_, err = si.CopyOut(t, infop)
 			}
 		}
@@ -413,7 +413,7 @@ func Waitid(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Syscal
 	if infop == 0 {
 		return 0, nil, nil
 	}
-	si := arch.SignalInfo{
+	si := linux.SignalInfo{
 		Signo: int32(linux.SIGCHLD),
 	}
 	si.SetPID(int32(wr.TID))
@@ -423,24 +423,24 @@ func Waitid(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Syscal
 	s := unix.WaitStatus(wr.Status)
 	switch {
 	case s.Exited():
-		si.Code = arch.CLD_EXITED
+		si.Code = linux.CLD_EXITED
 		si.SetStatus(int32(s.ExitStatus()))
 	case s.Signaled():
-		si.Code = arch.CLD_KILLED
+		si.Code = linux.CLD_KILLED
 		si.SetStatus(int32(s.Signal()))
 	case s.CoreDump():
-		si.Code = arch.CLD_DUMPED
+		si.Code = linux.CLD_DUMPED
 		si.SetStatus(int32(s.Signal()))
 	case s.Stopped():
 		if wr.Event == kernel.EventTraceeStop {
-			si.Code = arch.CLD_TRAPPED
+			si.Code = linux.CLD_TRAPPED
 			si.SetStatus(int32(s.TrapCause()))
 		} else {
-			si.Code = arch.CLD_STOPPED
+			si.Code = linux.CLD_STOPPED
 			si.SetStatus(int32(s.StopSignal()))
 		}
 	case s.Continued():
-		si.Code = arch.CLD_CONTINUED
+		si.Code = linux.CLD_CONTINUED
 		si.SetStatus(int32(linux.SIGCONT))
 	default:
 		t.Warningf("waitid got incomprehensible wait status %d", s)
diff --git a/pkg/sentry/syscalls/linux/vfs2/setstat.go b/pkg/sentry/syscalls/linux/vfs2/setstat.go
index c6330c21a..647e089d0 100644
--- a/pkg/sentry/syscalls/linux/vfs2/setstat.go
+++ b/pkg/sentry/syscalls/linux/vfs2/setstat.go
@@ -242,9 +242,9 @@ func Fallocate(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Sys
 	}
 	limit := limits.FromContext(t).Get(limits.FileSize).Cur
 	if uint64(size) >= limit {
-		t.SendSignal(&arch.SignalInfo{
+		t.SendSignal(&linux.SignalInfo{
 			Signo: int32(linux.SIGXFSZ),
-			Code:  arch.SignalInfoUser,
+			Code:  linux.SI_USER,
 		})
 		return 0, nil, syserror.EFBIG
 	}