diff options
| author | Ian Lance Taylor <iant@golang.org> | 2025-06-30 21:23:41 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2025-07-08 15:01:25 -0700 |
| commit | 284e13279e8c8067f7a0046a7ca8ff7a16398feb (patch) | |
| tree | 7cb14bc3f970ab7e66758af3d2623fd803f372c2 | |
| parent | ac2fb60a67d6d1de6446c25c5623b8a1389f4770 (diff) | |
| download | gcc-284e13279e8c8067f7a0046a7ca8ff7a16398feb.zip gcc-284e13279e8c8067f7a0046a7ca8ff7a16398feb.tar.gz gcc-284e13279e8c8067f7a0046a7ca8ff7a16398feb.tar.bz2 | |
syscall: pass correct pointer to system call in recvmsgRaw
The code in recvmsgRaw, introduced in https://go.dev/cl/384695,
incorrectly passed &rsa to the recvmsg system call.
But in recvmsgRaw rsa is already a pointer passed by the caller.
This change passes the correct pointer.
I'm guessing that this didn't show up in the testsuite because
we run the tests in short mode.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/685177
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/syscall/socket.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index b6fdf72..64eb27e 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -f5c453aa726ebb509e7b8cb20df7734f0e411404 +8aab4c94f039132b270ab03968f74d24d315e141 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/syscall/socket.go b/libgo/go/syscall/socket.go index 54a4a99..35665d5 100644 --- a/libgo/go/syscall/socket.go +++ b/libgo/go/syscall/socket.go @@ -467,7 +467,7 @@ func Sendto(fd int, p []byte, flags int, to Sockaddr) (err error) { func recvmsgRaw(fd int, p, oob []byte, flags int, rsa *RawSockaddrAny) (n, oobn int, recvflags int, err error) { var msg Msghdr - msg.Name = (*byte)(unsafe.Pointer(&rsa)) + msg.Name = (*byte)(unsafe.Pointer(rsa)) msg.Namelen = uint32(SizeofSockaddrAny) var iov Iovec if len(p) > 0 { |