]> Cypherpunks repositories - gostls13.git/commitdiff
runtime: mark string comparison hooks as no split
authorKhaled Yakdan <yakdan@code-intelligence.com>
Sat, 25 Jun 2022 05:17:45 +0000 (05:17 +0000)
committerKeith Randall <khr@golang.org>
Sat, 25 Jun 2022 21:33:56 +0000 (21:33 +0000)
These functions can be inserted by the compiler into the code to be
instrumented. This may result in these functions having callers that
are nosplit. That is why they must be nosplit.

This is a followup for CL 410034 in order to fix #53190.

Change-Id: I03746208a2a302a581a1eaad6c9d0672bb1e949a
GitHub-Last-Rev: 6506d86f221d745de083fad862bba7ba04a80455
GitHub-Pull-Request: golang/go#53544
Reviewed-on: https://go-review.googlesource.com/c/go/+/413978
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>

src/runtime/libfuzzer.go

index 02dcc18e7a3cb6b0e9e5a61a69ba182724564a3a..6bfaef823b97a4141f09d76c3c296ceeabf4e318 100644 (file)
@@ -92,6 +92,8 @@ func init() {
 //  4. result: an integer representing the comparison result. 0 indicates
 //     equality (comparison will ignored by libfuzzer), non-zero indicates a
 //     difference (comparison will be taken into consideration).
+//
+//go:nosplit
 func libfuzzerHookStrCmp(s1, s2 string, fakePC int) {
        if s1 != s2 {
                libfuzzerCall4(&__sanitizer_weak_hook_strcmp, uintptr(fakePC), cstring(s1), cstring(s2), uintptr(1))
@@ -102,6 +104,8 @@ func libfuzzerHookStrCmp(s1, s2 string, fakePC int) {
 
 // This function has now the same implementation as libfuzzerHookStrCmp because we lack better checks
 // for case-insensitive string equality in the runtime package.
+//
+//go:nosplit
 func libfuzzerHookEqualFold(s1, s2 string, fakePC int) {
        if s1 != s2 {
                libfuzzerCall4(&__sanitizer_weak_hook_strcmp, uintptr(fakePC), cstring(s1), cstring(s2), uintptr(1))