summaryrefslogtreecommitdiffhomepage
path: root/pkg/safecopy
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-06-10 05:57:41 +0000
committergVisor bot <gvisor-bot@google.com>2021-06-10 05:57:41 +0000
commitb6d9ec9af725a7b070e7d476692074f8904ddebe (patch)
tree1e8983f795d99d486a660729eab6f916e8f142e6 /pkg/safecopy
parentbc4d6e685a252dc65a5c108aefe61bff9149dc6a (diff)
parent8d87a9418aacc175d7a2fa3583f40988e05946cc (diff)
Merge release-20210601.0-33-g8d87a9418 (automated)
Diffstat (limited to 'pkg/safecopy')
-rw-r--r--pkg/safecopy/safecopy_unsafe.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/safecopy/safecopy_unsafe.go b/pkg/safecopy/safecopy_unsafe.go
index efbc2ddc1..3ec73f296 100644
--- a/pkg/safecopy/safecopy_unsafe.go
+++ b/pkg/safecopy/safecopy_unsafe.go
@@ -342,6 +342,9 @@ func errorFromFaultSignal(addr uintptr, sig int32) error {
// handler however, and if this is function is being used externally then the
// same courtesy is expected.
func ReplaceSignalHandler(sig unix.Signal, handler uintptr, previous *uintptr) error {
+ // TODO(gvisor.dev/issue/6160): This struct is the same as linux.SigAction.
+ // Once the usermem dependency is removed from primitive, delete this replica
+ // and remove IFTTT comments in abi/linux/signal.go.
var sa struct {
handler uintptr
flags uint64