[release-branch.go1.12] runtime: fix textOff for multiple text sections

If a compilation has multiple text sections, code in
textOff must compare the offset argument against the range
for each text section to determine which one it is in.
The comparison looks like this:

if uintptr(off) >= sectaddr && uintptr(off) <= sectaddr+sectlen

If the off value being compared is equal to sectaddr+sectlen then it
is not within the range of the text section but after it. The
comparison should be just '<'.

Fixes #35210

Change-Id: I114633fd734563d38f4e842dd884c6c239f73c95
Reviewed-on: https://go-review.googlesource.com/c/go/+/203817
Run-TryBot: Lynn Boger <laboger@linux.vnet.ibm.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
(cherry picked from commit 0ae9389609f23dc905c58fc2ad7bcc16b770f337)
Reviewed-on: https://go-review.googlesource.com/c/go/+/203818
Run-TryBot: Carlos Amedee <carlos@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/runtime/type.go b/src/runtime/type.go
index f7f99924eaf759bf63cacd087eb16b0e508f317f..a393da19f74683ebbe25ad83bd6bb9a4570607b9 100644 (file)
--- a/src/runtime/type.go
+++ b/src/runtime/type.go
@@ -290,7 +290,7 @@ func (t *_type) textOff(off textOff) unsafe.Pointer {
                for i := range md.textsectmap {
                        sectaddr := md.textsectmap[i].vaddr
                        sectlen := md.textsectmap[i].length
-                       if uintptr(off) >= sectaddr && uintptr(off) <= sectaddr+sectlen {
+                       if uintptr(off) >= sectaddr && uintptr(off) < sectaddr+sectlen {
                                res = md.textsectmap[i].baseaddr + uintptr(off) - uintptr(md.textsectmap[i].vaddr)
                                break
                        }