aboutsummaryrefslogtreecommitdiff
path: root/src/syscall/syscall_linux.go
diff options
context:
space:
mode:
authorNicolas BRULEZ <n.brulez@gmail.com>2017-09-26 10:35:04 +0200
committerIan Lance Taylor <iant@golang.org>2017-09-26 15:08:03 +0000
commit08a17966712f6edf1600e3eafb7758a153b55ec4 (patch)
tree7bfa572baf68991ab101c0e8b0fc9f22ec741395 /src/syscall/syscall_linux.go
parentc99cfd93a86dc76ff276b13211ef65ab2752bfc7 (diff)
downloadgo-08a17966712f6edf1600e3eafb7758a153b55ec4.tar.xz
syscall: allow abstract unix socket to use the full Path len
The previous implementation forced all Unix socket to have a name strictly shorter than len(sa.raw.Path) to allow a terminating NULL byte to be added. This requirement does not apply to abstract socket names under Linux, so for this case we allow the full length. Fixes #21965 Change-Id: I1d1f58b6b6172d589428c7230cfeae984de78b4b Reviewed-on: https://go-review.googlesource.com/66190 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/syscall/syscall_linux.go')
-rw-r--r--src/syscall/syscall_linux.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/syscall/syscall_linux.go b/src/syscall/syscall_linux.go
index 3c7d378d71..b42a8c1ba4 100644
--- a/src/syscall/syscall_linux.go
+++ b/src/syscall/syscall_linux.go
@@ -295,7 +295,10 @@ func (sa *SockaddrInet6) sockaddr() (unsafe.Pointer, _Socklen, error) {
func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
name := sa.Name
n := len(name)
- if n >= len(sa.raw.Path) {
+ if n > len(sa.raw.Path) {
+ return nil, 0, EINVAL
+ }
+ if n == len(sa.raw.Path) && name[0] != '@' {
return nil, 0, EINVAL
}
sa.raw.Family = AF_UNIX