aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/iface.go
diff options
context:
space:
mode:
authorCherry Zhang <cherryyz@google.com>2019-04-11 14:00:07 -0400
committerCherry Zhang <cherryyz@google.com>2019-04-11 18:59:57 +0000
commit8d86ef221631757ef4d89401947db674c730f94e (patch)
tree4e8b2ebff3f5ae7f342236189bcd4d3fdb6425c7 /src/runtime/iface.go
parent770f2a17d28ae9311331692ff5e7e5950ec2c267 (diff)
downloadgo-8d86ef221631757ef4d89401947db674c730f94e.tar.gz
go-8d86ef221631757ef4d89401947db674c730f94e.zip
runtime: set itab.fun[0] only on successful conversion
For a failed interface conversion not in ",ok" form, getitab calls itab.init to get the name of the missing method for the panic message. itab.init will try to find the methods, populate the method table as it goes. When some method is missing, it sets itab.fun[0] to 0 before return. There is a small window that itab.fun[0] could be non-zero. If concurrently, another goroutine tries to do the same interface conversion, it will read the same itab's fun[0]. If this happens in the small window, it sees a non-zero fun[0] and thinks the conversion succeeded, which is bad. Fix the race by setting fun[0] to non-zero only when we know the conversion succeeds. While here, also simplify the syntax slightly. Fixes #31419. Change-Id: Ied34d3043079eb933e330c5877b85e13f98f1916 Reviewed-on: https://go-review.googlesource.com/c/go/+/171759 Run-TryBot: Cherry Zhang <cherryyz@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
Diffstat (limited to 'src/runtime/iface.go')
-rw-r--r--src/runtime/iface.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/runtime/iface.go b/src/runtime/iface.go
index 246b63b897..bb4eccc9bd 100644
--- a/src/runtime/iface.go
+++ b/src/runtime/iface.go
@@ -195,6 +195,8 @@ func (m *itab) init() string {
nt := int(x.mcount)
xmhdr := (*[1 << 16]method)(add(unsafe.Pointer(x), uintptr(x.moff)))[:nt:nt]
j := 0
+ methods := (*[1 << 16]unsafe.Pointer)(unsafe.Pointer(&m.fun[0]))[:ni:ni]
+ var fun0 unsafe.Pointer
imethods:
for k := 0; k < ni; k++ {
i := &inter.mhdr[k]
@@ -216,7 +218,11 @@ imethods:
if tname.isExported() || pkgPath == ipkg {
if m != nil {
ifn := typ.textOff(t.ifn)
- *(*unsafe.Pointer)(add(unsafe.Pointer(&m.fun[0]), uintptr(k)*sys.PtrSize)) = ifn
+ if k == 0 {
+ fun0 = ifn // we'll set m.fun[0] at the end
+ } else {
+ methods[k] = ifn
+ }
}
continue imethods
}
@@ -226,6 +232,7 @@ imethods:
m.fun[0] = 0
return iname
}
+ m.fun[0] = uintptr(fun0)
m.hash = typ.hash
return ""
}