commit ed4b3e0958d3de6a92d82abb9f81e49e84d5c673
author Vladimir Marko <vmarko@google.com> Fri Dec 04 15:50:30 2020 +0000
committer Vladimir Marko <vmarko@google.com> Tue Dec 08 09:41:01 2020 +0000
tree 8a21236ca2813ae0da6da45c56392a0608779988
parent 7dd48b90bd0968375cba8dffa2141cc9973329f9

Add SafetyNet logging to JNI::NewStringUTF.

(cherry picked from commit 10c45e29774d51e5b770f1b369dba90015c640a5)

Test: blueline-userdebug boots.
Bug: 172655291
Merged-In: I653db8be0c0a45302f0d1c54285c02d2d052a9f4
Change-Id: I653db8be0c0a45302f0d1c54285c02d2d052a9f4

runtime/jni/jni_internal.cc

diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc
index 8e4f60f..f4ef785 100644
--- a/runtime/jni/jni_internal.cc
+++ b/runtime/jni/jni_internal.cc
@@ -17,6 +17,7 @@
 #include "jni_internal.h"
 
 #include <cstdarg>
+#include <log/log.h>
 #include <memory>
 #include <utility>
 
@@ -1914,6 +1915,7 @@
         /*bad=*/ []() { return true; });  // Abort processing and return 0 for bad characters.
     if (UNLIKELY(utf8_length != 0u && utf16_length == 0u)) {
       // VisitModifiedUtf8Chars() aborted for a bad character.
+      android_errorWriteLog(0x534e4554, "172655291");  // Report to SafetyNet.
       // Report the error to logcat but avoid too much spam.
       static const uint64_t kMinDelay = UINT64_C(10000000000);  // 10s
       static std::atomic<uint64_t> prev_bad_input_time(UINT64_C(0));