Skip to content

8361447: [REDO] Checked version of JNI Release<type>ArrayElements needs to filter out known wrapped arrays #26177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from

Conversation

dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Jul 8, 2025

The original PR (#26123) had incorrect usage of SafeFetch32. This PR replaces that with the use of os::is_readable_range as proposed by @tstuefe (thank you!). In addition I found that code was no longer getting exercised by the regression test so I added a gtest for that (during which it was discovered that the new implementation in verify requires any gtest that uses it to be TEST_VM rather than TEST).

Testing: tiers 1-4

Thanks


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8361447: [REDO] Checked version of JNI Release<type>ArrayElements needs to filter out known wrapped arrays (Bug - P3)

Reviewers

Contributors

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26177/head:pull/26177
$ git checkout pull/26177

Update a local copy of the PR:
$ git checkout pull/26177
$ git pull https://git.openjdk.org/jdk.git pull/26177/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26177

View PR using the GUI difftool:
$ git pr show -t 26177

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26177.diff

Using Webrev

Link to Webrev Comment

@dholmes-ora
Copy link
Member Author

/contributor add @tstuefe

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 8, 2025

👋 Welcome back dholmes! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jul 8, 2025

@dholmes-ora This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8361447: [REDO] Checked version of JNI Release<type>ArrayElements needs to filter out known wrapped arrays

Co-authored-by: Thomas Stuefe <[email protected]>
Reviewed-by: mdoerr, stuefe, coleenp

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 43 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 8, 2025
@openjdk
Copy link

openjdk bot commented Jul 8, 2025

@dholmes-ora
Contributor Thomas Stuefe <[email protected]> successfully added.

@openjdk
Copy link

openjdk bot commented Jul 8, 2025

@dholmes-ora The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@dholmes-ora
Copy link
Member Author

@MBaesken please run this through your testing - thanks.

@mlbridge
Copy link

mlbridge bot commented Jul 8, 2025

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. Thank you for considering my suggestions.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 8, 2025
@dholmes-ora
Copy link
Member Author

Thanks for the review @tstuefe !

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this looks good. Let's see what the tests and UBSan say (Matthias is testing).

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. is_readable_range avoids unaligned SafeFetch32, right?

@TheRealMDoerr
Copy link
Contributor

TheRealMDoerr commented Jul 8, 2025

This looks good. is_readable_range avoids unaligned SafeFetch32, right?

Right. It aligns down to min_page_size which is fine.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jul 9, 2025
@dholmes-ora
Copy link
Member Author

This looks good. is_readable_range avoids unaligned SafeFetch32, right?

Right. It aligns down to min_page_size which is fine.

It also avoids the endian-ness issue of reading a byte from a 32-bit int.

Thanks for the review @coleenp !

@MBaesken
Copy link
Member

MBaesken commented Jul 9, 2025

run this through your testing - thanks.

Hi David, the tests look good, I did not see issues related to your change !
(maybe the ubsan issue reported is still there but we do not test with ubsanized binaries daily; but if it is still there we can address it separately)

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 9, 2025
@dholmes-ora
Copy link
Member Author

Thanks for doing the testing @MBaesken !

Thanks for the review @TheRealMDoerr !

/integrate

@openjdk
Copy link

openjdk bot commented Jul 10, 2025

Going to push as commit f67e435.
Since your change was applied there have been 62 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 10, 2025
@openjdk openjdk bot closed this Jul 10, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 10, 2025
@openjdk
Copy link

openjdk bot commented Jul 10, 2025

@dholmes-ora Pushed as commit f67e435.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@dholmes-ora dholmes-ora deleted the 8361447-xcheck-jni branch July 10, 2025 02:22
@dholmes-ora
Copy link
Member Author

/backport jdk jdk25

@openjdk
Copy link

openjdk bot commented Jul 10, 2025

@dholmes-ora the backport was successfully created on the branch backport-dholmes-ora-f67e4354-jdk25 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk25, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit f67e4354 from the openjdk/jdk repository.

The commit being backported was authored by David Holmes on 10 Jul 2025 and was reviewed by Martin Doerr, Thomas Stuefe and Coleen Phillimore.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk:

$ git fetch https://github.com/openjdk-bots/jdk.git backport-dholmes-ora-f67e4354-jdk25:backport-dholmes-ora-f67e4354-jdk25
$ git checkout backport-dholmes-ora-f67e4354-jdk25
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk.git backport-dholmes-ora-f67e4354-jdk25

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants