From 5ce2718fe2e78cbfa727dcc6c3ee5511bfb83343 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 25 Feb 2021 00:18:05 +0100 Subject: [PATCH] winc: use uintptr variable for key parameter of GetQueuedCompletionStatus As of https://github.com/golang/sys/commit/683adc9d29d7 this function now takes a uintptr, in order to avoid a buffer overflow. --- env/winc/environment_windows.go | 3 ++- go.mod | 2 +- go.sum | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/env/winc/environment_windows.go b/env/winc/environment_windows.go index 4a64319..7209677 100644 --- a/env/winc/environment_windows.go +++ b/env/winc/environment_windows.go @@ -197,7 +197,8 @@ func (e *Environment) Execve(ctx context.Context, param envexec.ExecveParam) (pr defer close(done) var ( - qty, key uint32 + qty uint32 + key uintptr overlapped *windows.Overlapped ) result := runner.Result{ diff --git a/go.mod b/go.mod index c3107f1..3db6f14 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( golang.org/x/net v0.0.0-20210222171744-9060382bd457 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20210223212115-eede4237b368 + golang.org/x/sys v0.0.0-20210225014209-683adc9d29d7 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect google.golang.org/genproto v0.0.0-20210223151946-22b48be4551b // indirect google.golang.org/grpc v1.35.0 diff --git a/go.sum b/go.sum index d58fcbd..0660c3f 100644 --- a/go.sum +++ b/go.sum @@ -616,8 +616,9 @@ golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210223212115-eede4237b368 h1:fDE3p0qf2V1co1vfj3/o87Ps8Hq6QTGNxJ5Xe7xSp80= golang.org/x/sys v0.0.0-20210223212115-eede4237b368/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225014209-683adc9d29d7 h1:pk3Y+QnSKjMLfO/HIqzn/Zvv3/IHjRPhwblrmUuodzw= +golang.org/x/sys v0.0.0-20210225014209-683adc9d29d7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=