8361439: [BACKOUT] 8357601: Checked version of JNI Release<type>ArrayElements needs to filter out known wrapped arrays

Reviewed-by: lmesnik

Author: David Holmes

src/hotspot/os/windows/safefetch_windows.hpp

@@ -29,7 +29,6 @@
 #include "sanitizers/address.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-#include <Windows.h>
 // On windows, we use structured exception handling to implement SafeFetch
 
 template <class T>

src/hotspot/share/memory/guardedMemory.cpp

@@ -25,12 +25,11 @@
 #include "nmt/memTag.hpp"
 #include "runtime/os.hpp"
 
-void* GuardedMemory::wrap_copy(const void* ptr, const size_t len,
-                               const void* tag, const void* tag2) {
+void* GuardedMemory::wrap_copy(const void* ptr, const size_t len, const void* tag) {
   size_t total_sz = GuardedMemory::get_total_size(len);
   void* outerp = os::malloc(total_sz, mtInternal);
   if (outerp != nullptr) {
-    GuardedMemory guarded(outerp, len, tag, tag2);
+    GuardedMemory guarded(outerp, len, tag);
     void* innerp = guarded.get_user_ptr();
     if (ptr != nullptr) {
       memcpy(innerp, ptr, len);
@@ -59,8 +58,8 @@ void GuardedMemory::print_on(outputStream* st) const {
     return;
   }
   st->print_cr("GuardedMemory(" PTR_FORMAT ") base_addr=" PTR_FORMAT
-      " tag=" PTR_FORMAT " tag2=" PTR_FORMAT " user_size=%zu user_data=" PTR_FORMAT,
-      p2i(this), p2i(_base_addr), p2i(get_tag()), p2i(get_tag2()), get_user_size(), p2i(get_user_ptr()));
+      " tag=" PTR_FORMAT " user_size=%zu user_data=" PTR_FORMAT,
+      p2i(this), p2i(_base_addr), p2i(get_tag()), get_user_size(), p2i(get_user_ptr()));
 
   Guard* guard = get_head_guard();
   st->print_cr("  Header guard @" PTR_FORMAT " is %s", p2i(guard), (guard->verify() ? "OK" : "BROKEN"));

src/hotspot/share/memory/guardedMemory.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
 #define SHARE_MEMORY_GUARDEDMEMORY_HPP
 
 #include "memory/allocation.hpp"
-#include "runtime/safefetch.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 /**
@@ -44,14 +43,13 @@
  * |base_addr          | 0xABABABABABABABAB   | Head guard     |
  * |+16                | <size_t:user_size>   | User data size |
  * |+sizeof(uintptr_t) | <tag>                | Tag word       |
- * |+sizeof(uintptr_t) | <tag2>               | Tag word       |
  * |+sizeof(void*)     | 0xF1 <user_data> (   | User data      |
  * |+user_size         | 0xABABABABABABABAB   | Tail guard     |
  * -------------------------------------------------------------
  *
  * Where:
  *  - guard padding uses "badResourceValue" (0xAB)
- *  - tag word and tag2 word are general purpose
+ *  - tag word is general purpose
  *  - user data
  *    -- initially padded with "uninitBlockPad" (0xF1),
  *    -- to "freeBlockPad" (0xBA), when freed
@@ -116,11 +114,7 @@ class GuardedMemory : StackObj { // Wrapper on stack
       u_char* c = (u_char*) _guard;
       u_char* end = c + GUARD_SIZE;
       while (c < end) {
-        // We may not be able to dereference directly so use
-        // SafeFetch. It doesn't matter if the value read happens
-        // to be 0xFF as that is not what we expect anyway.
-        u_char val = (u_char) SafeFetch32((int*)c, 0xFF);
-        if (val != badResourceValue) {
+        if (*c != badResourceValue) {
           return false;
         }
         c++;
@@ -143,18 +137,13 @@ class GuardedMemory : StackObj { // Wrapper on stack
       size_t _user_size;
     };
     void* _tag;
-    void* _tag2;
    public:
     void set_user_size(const size_t usz) { _user_size = usz; }
     size_t get_user_size() const { return _user_size; }
 
     void set_tag(const void* tag) { _tag = (void*) tag; }
     void* get_tag() const { return _tag; }
 
-    void set_tag2(const void* tag2) { _tag2 = (void*) tag2; }
-    void* get_tag2() const { return _tag2; }
-
-
   }; // GuardedMemory::GuardHeader
 
   // Guarded Memory...
@@ -173,11 +162,9 @@ class GuardedMemory : StackObj { // Wrapper on stack
    * @param base_ptr  allocation wishing to be wrapped, must be at least "GuardedMemory::get_total_size()" bytes.
    * @param user_size the size of the user data to be wrapped.
    * @param tag       optional general purpose tag.
-   * @param tag2      optional second general purpose tag.
    */
-  GuardedMemory(void* base_ptr, const size_t user_size,
-                const void* tag = nullptr, const void* tag2 = nullptr) {
-    wrap_with_guards(base_ptr, user_size, tag, tag2);
+  GuardedMemory(void* base_ptr, const size_t user_size, const void* tag = nullptr) {
+    wrap_with_guards(base_ptr, user_size, tag);
   }
 
   /**
@@ -202,19 +189,16 @@ class GuardedMemory : StackObj { // Wrapper on stack
    * @param base_ptr  allocation wishing to be wrapped, must be at least "GuardedMemory::get_total_size()" bytes.
    * @param user_size the size of the user data to be wrapped.
    * @param tag       optional general purpose tag.
-   * @param tag2      optional second general purpose tag.
    *
    * @return user data pointer (inner pointer to supplied "base_ptr").
    */
-  void* wrap_with_guards(void* base_ptr, size_t user_size,
-                         const void* tag = nullptr, const void* tag2 = nullptr) {
+  void* wrap_with_guards(void* base_ptr, size_t user_size, const void* tag = nullptr) {
     assert(base_ptr != nullptr, "Attempt to wrap null with memory guard");
     _base_addr = (u_char*)base_ptr;
     get_head_guard()->build();
     get_head_guard()->set_user_size(user_size);
     get_tail_guard()->build();
     set_tag(tag);
-    set_tag2(tag2);
     set_user_bytes(uninitBlockPad);
     assert(verify_guards(), "Expected valid memory guards");
     return get_user_ptr();
@@ -246,20 +230,6 @@ class GuardedMemory : StackObj { // Wrapper on stack
    */
   void* get_tag() const { return get_head_guard()->get_tag(); }
 
-  /**
-   * Set the second general purpose tag.
-   *
-   * @param tag general purpose tag.
-   */
-  void set_tag2(const void* tag) { get_head_guard()->set_tag2(tag); }
-
-  /**
-   * Return the second general purpose tag.
-   *
-   * @return the second general purpose tag, defaults to null.
-   */
-  void* get_tag2() const { return get_head_guard()->get_tag2(); }
-
   /**
    * Return the size of the user data.
    *
@@ -332,12 +302,10 @@ class GuardedMemory : StackObj { // Wrapper on stack
    * @param ptr the memory to be copied
    * @param len the length of the copy
    * @param tag optional general purpose tag (see GuardedMemory::get_tag())
-   * @param tag2 optional general purpose tag (see GuardedMemory::get_tag2())
    *
    * @return guarded wrapped memory pointer to the user area, or null if OOM.
    */
-  static void* wrap_copy(const void* p, const size_t len,
-                         const void* tag = nullptr, const void* tag2 = nullptr);
+  static void* wrap_copy(const void* p, const size_t len, const void* tag = nullptr);
 
   /**
    * Free wrapped copy.

src/hotspot/share/prims/jniCheck.cpp

@@ -350,33 +350,24 @@ check_is_obj_array(JavaThread* thr, jarray jArray) {
   }
 }
 
-// Arbitrary (but well-known) tag for GetStringChars
-const void* STRING_TAG = (void*)0x47114711;
-
-// Arbitrary (but well-known) tag for GetStringUTFChars
-const void* STRING_UTF_TAG = (void*) 0x48124812;
-
-// Arbitrary (but well-known) tag for GetPrimitiveArrayCritical
-const void* CRITICAL_TAG = (void*)0x49134913;
-
 /*
  * Copy and wrap array elements for bounds checking.
  * Remember the original elements (GuardedMemory::get_tag())
  */
 static void* check_jni_wrap_copy_array(JavaThread* thr, jarray array,
-                                       void* orig_elements, jboolean is_critical = JNI_FALSE) {
+    void* orig_elements) {
   void* result;
   IN_VM(
     oop a = JNIHandles::resolve_non_null(array);
     size_t len = arrayOop(a)->length() <<
         TypeArrayKlass::cast(a->klass())->log2_element_size();
-    result = GuardedMemory::wrap_copy(orig_elements, len, orig_elements, is_critical ? CRITICAL_TAG : nullptr);
+    result = GuardedMemory::wrap_copy(orig_elements, len, orig_elements);
   )
   return result;
 }
 
 static void* check_wrapped_array(JavaThread* thr, const char* fn_name,
-                                 void* obj, void* carray, size_t* rsz, jboolean is_critical) {
+    void* obj, void* carray, size_t* rsz) {
   if (carray == nullptr) {
     tty->print_cr("%s: elements vector null" PTR_FORMAT, fn_name, p2i(obj));
     NativeReportJNIFatalError(thr, "Elements vector null");
@@ -395,29 +386,6 @@ static void* check_wrapped_array(JavaThread* thr, const char* fn_name,
     DEBUG_ONLY(guarded.print_on(tty);) // This may crash.
     NativeReportJNIFatalError(thr, err_msg("%s: unrecognized elements", fn_name));
   }
-  if (orig_result == STRING_TAG || orig_result == STRING_UTF_TAG) {
-    bool was_utf = orig_result == STRING_UTF_TAG;
-    tty->print_cr("%s: called on something allocated by %s",
-                  fn_name, was_utf ? "GetStringUTFChars" : "GetStringChars");
-    DEBUG_ONLY(guarded.print_on(tty);) // This may crash.
-    NativeReportJNIFatalError(thr, err_msg("%s called on something allocated by %s",
-                                           fn_name, was_utf ? "GetStringUTFChars" : "GetStringChars"));
-  }
-
-  if (is_critical && (guarded.get_tag2() != CRITICAL_TAG)) {
-    tty->print_cr("%s: called on something not allocated by GetPrimitiveArrayCritical", fn_name);
-    DEBUG_ONLY(guarded.print_on(tty);) // This may crash.
-    NativeReportJNIFatalError(thr, err_msg("%s called on something not allocated by GetPrimitiveArrayCritical",
-                                           fn_name));
-  }
-
-  if (!is_critical && (guarded.get_tag2() == CRITICAL_TAG)) {
-    tty->print_cr("%s: called on something allocated by GetPrimitiveArrayCritical", fn_name);
-    DEBUG_ONLY(guarded.print_on(tty);) // This may crash.
-    NativeReportJNIFatalError(thr, err_msg("%s called on something allocated by GetPrimitiveArrayCritical",
-                                           fn_name));
-  }
-
   if (rsz != nullptr) {
     *rsz = guarded.get_user_size();
   }
@@ -427,7 +395,7 @@ static void* check_wrapped_array(JavaThread* thr, const char* fn_name,
 static void* check_wrapped_array_release(JavaThread* thr, const char* fn_name,
                                          void* obj, void* carray, jint mode, jboolean is_critical) {
   size_t sz;
-  void* orig_result = check_wrapped_array(thr, fn_name, obj, carray, &sz, is_critical);
+  void* orig_result = check_wrapped_array(thr, fn_name, obj, carray, &sz);
   switch (mode) {
   case 0:
     memcpy(orig_result, carray, sz);
@@ -1462,6 +1430,9 @@ JNI_ENTRY_CHECKED(jsize,
     return result;
 JNI_END
 
+// Arbitrary (but well-known) tag
+const void* STRING_TAG = (void*)0x47114711;
+
 JNI_ENTRY_CHECKED(const jchar *,
   checked_jni_GetStringChars(JNIEnv *env,
                              jstring str,
@@ -1564,6 +1535,9 @@ JNI_ENTRY_CHECKED(jlong,
     return result;
 JNI_END
 
+// Arbitrary (but well-known) tag - different than GetStringChars
+const void* STRING_UTF_TAG = (void*) 0x48124812;
+
 JNI_ENTRY_CHECKED(const char *,
   checked_jni_GetStringUTFChars(JNIEnv *env,
                                 jstring str,
@@ -1885,7 +1859,7 @@ JNI_ENTRY_CHECKED(void *,
     )
     void *result = UNCHECKED()->GetPrimitiveArrayCritical(env, array, isCopy);
     if (result != nullptr) {
-      result = check_jni_wrap_copy_array(thr, array, result, JNI_TRUE);
+      result = check_jni_wrap_copy_array(thr, array, result);
     }
     functionExit(thr);
     return result;