cmd/compile: fix checkptr false positive for (*[Big]T)(ptr)[:n:n] pattern

The checkptr instrumentation is currently inserted before slice
operation has validated that n <= Big. So instead of panic, checkptr
have false positive throws.

To fix this, just insert the checkptr instrumentation after the bound
checking during SSA generation.

Fixes #46938

Change-Id: I9dbf84441c711842ccc883f3654ca8766ac696d8
Reviewed-on: https://go-review.googlesource.com/c/go/+/343972
Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Cuong Manh Le 2021-08-20 11:38:54 +07:00
parent 54cdef1f10
commit de1c934b97
5 changed files with 49 additions and 7 deletions

View File

@ -570,10 +570,11 @@ func (*SelectorExpr) CanBeNtype() {}
// A SliceExpr is a slice expression X[Low:High] or X[Low:High:Max]. // A SliceExpr is a slice expression X[Low:High] or X[Low:High:Max].
type SliceExpr struct { type SliceExpr struct {
miniExpr miniExpr
X Node X Node
Low Node Low Node
High Node High Node
Max Node Max Node
CheckPtrCall *CallExpr
} }
func NewSliceExpr(pos src.XPos, op Op, x, low, high, max Node) *SliceExpr { func NewSliceExpr(pos src.XPos, op Op, x, low, high, max Node) *SliceExpr {

View File

@ -3090,6 +3090,9 @@ func (s *state) expr(n ir.Node) *ssa.Value {
k = s.expr(n.Max) k = s.expr(n.Max)
} }
p, l, c := s.slice(v, i, j, k, n.Bounded()) p, l, c := s.slice(v, i, j, k, n.Bounded())
if n.CheckPtrCall != nil {
s.stmt(n.CheckPtrCall)
}
return s.newValue3(ssa.OpSliceMake, n.Type(), p, l, c) return s.newValue3(ssa.OpSliceMake, n.Type(), p, l, c)
case ir.OSLICESTR: case ir.OSLICESTR:

View File

@ -413,11 +413,15 @@ func byteindex(n ir.Node) ir.Node {
return n return n
} }
func walkCheckPtrAlignment(n *ir.ConvExpr, init *ir.Nodes, count ir.Node) ir.Node { func walkCheckPtrAlignment(n *ir.ConvExpr, init *ir.Nodes, se *ir.SliceExpr) ir.Node {
if !n.Type().IsPtr() { if !n.Type().IsPtr() {
base.Fatalf("expected pointer type: %v", n.Type()) base.Fatalf("expected pointer type: %v", n.Type())
} }
elem := n.Type().Elem() elem := n.Type().Elem()
var count ir.Node
if se != nil {
count = se.Max
}
if count != nil { if count != nil {
if !elem.IsArray() { if !elem.IsArray() {
base.Fatalf("expected array type: %v", elem) base.Fatalf("expected array type: %v", elem)
@ -435,7 +439,12 @@ func walkCheckPtrAlignment(n *ir.ConvExpr, init *ir.Nodes, count ir.Node) ir.Nod
} }
n.X = cheapExpr(n.X, init) n.X = cheapExpr(n.X, init)
init.Append(mkcall("checkptrAlignment", nil, init, typecheck.ConvNop(n.X, types.Types[types.TUNSAFEPTR]), reflectdata.TypePtr(elem), typecheck.Conv(count, types.Types[types.TUINTPTR]))) checkPtrCall := mkcall("checkptrAlignment", nil, init, typecheck.ConvNop(n.X, types.Types[types.TUNSAFEPTR]), reflectdata.TypePtr(elem), typecheck.Conv(count, types.Types[types.TUINTPTR]))
if se != nil {
se.CheckPtrCall = checkPtrCall
} else {
init.Append(checkPtrCall)
}
return n return n
} }

View File

@ -824,7 +824,7 @@ func walkSlice(n *ir.SliceExpr, init *ir.Nodes) ir.Node {
n.High = walkExpr(n.High, init) n.High = walkExpr(n.High, init)
n.Max = walkExpr(n.Max, init) n.Max = walkExpr(n.Max, init)
if checkSlice { if checkSlice {
n.X = walkCheckPtrAlignment(n.X.(*ir.ConvExpr), init, n.Max) n.X = walkCheckPtrAlignment(n.X.(*ir.ConvExpr), init, n)
} }
if n.Op().IsSlice3() { if n.Op().IsSlice3() {

View File

@ -0,0 +1,29 @@
// run -gcflags="-d=checkptr"
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package main
import (
"strings"
"unsafe"
)
func main() {
defer func() {
err := recover()
if err == nil {
panic("expected panic")
}
if got := err.(error).Error(); !strings.Contains(got, "slice bounds out of range") {
panic("expected panic slice out of bound, got " + got)
}
}()
s := make([]int64, 100)
p := unsafe.Pointer(&s[0])
n := 1000
_ = (*[10]int64)(p)[:n:n]
}