Skip to content
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

8333622: ubsan: relocInfo_x86.cpp:101:56: runtime error: pointer index expression with base (-1) overflowed #19568

Closed
wants to merge 1 commit into from

Conversation

vnkozlov
Copy link
Contributor

@vnkozlov vnkozlov commented Jun 5, 2024

Add missing check to pd_call_destination() similar to check in pd_set_call_destination() to avoid arithmetic with (address)(-1).

Tested tier1-3,stress,xcomp


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-8333622: ubsan: relocInfo_x86.cpp:101:56: runtime error: pointer index expression with base (-1) overflowed (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19568

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 5, 2024

👋 Welcome back kvn! 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 Jun 5, 2024

@vnkozlov 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:

8333622: ubsan: relocInfo_x86.cpp:101:56: runtime error: pointer index expression with base (-1) overflowed

Reviewed-by: thartmann, chagedorn

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 6 new commits pushed to the master branch:

  • 6f690a5: 8333177: Invalid value used for enum Cell in ciTypeFlow::get_start_state
  • b351b5f: 8331736: C2: Live Node limit exceeded limit after JDK-8316991
  • b3f540d: 8332921: Ctrl+C does not call shutdown hooks after JLine upgrade
  • 3089412: 8326716: JVMTI spec: clarify what nullptr means for C/C++ developers
  • ca93907: 8256828: ostream::print_cr() truncates buffer in copy-through case
  • 60ea17e: 8311177: Switching to interpreter only mode in carrier thread can lead to crashes

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 Jun 5, 2024
@openjdk
Copy link

openjdk bot commented Jun 5, 2024

@vnkozlov The following label will be automatically applied to this pull request:

  • hotspot-compiler

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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jun 5, 2024
@vnkozlov
Copy link
Contributor Author

vnkozlov commented Jun 5, 2024

Note: current code works because pd_set_call_destination() ignores result of pd_call_destination() when destination address is -1: relocInfo_x86.cpp#L120

@mlbridge
Copy link

mlbridge bot commented Jun 5, 2024

Webrevs

@vnkozlov
Copy link
Contributor Author

vnkozlov commented Jun 5, 2024

@MBaesken, please verify the fix. Thanks!

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 6, 2024
Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Looks good to me, too.

@MBaesken
Copy link
Member

MBaesken commented Jun 6, 2024

@MBaesken, please verify the fix. Thanks!

Fix looks good, ubsan-enabled linux x86_64 build with that fix included shows no issues in relocInfo_x86.cpp .

@vnkozlov
Copy link
Contributor Author

vnkozlov commented Jun 6, 2024

Thank you all for reviews and testing.

@vnkozlov
Copy link
Contributor Author

vnkozlov commented Jun 6, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jun 6, 2024

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

  • 8de5d20: 8332865: ubsan: os::attempt_reserve_memory_between reports overflow
  • f15d423: 6942632: Hotspot should be able to use more than 64 logical processors on Windows
  • 1a50bd0: 8322568: JFR: Improve metadata for IEEE rounding mode fields
  • 880c6b4: 8333178: ubsan: jvmti_tools.cpp:149:16: runtime error: null pointer passed as argument 2, which is declared to never be null
  • c7d2841: 8332070: Convert package.html files in java.management to package-info.java
  • 7ef2831: 8333644: C2: assert(is_Bool()) failed: invalid node class: Phi
  • 8f07853: 8333410: [AArch64] Clean unused classes in nativeInst_aarch64.hpp
  • 6f690a5: 8333177: Invalid value used for enum Cell in ciTypeFlow::get_start_state
  • b351b5f: 8331736: C2: Live Node limit exceeded limit after JDK-8316991
  • b3f540d: 8332921: Ctrl+C does not call shutdown hooks after JLine upgrade
  • ... and 3 more: https://git.openjdk.org/jdk/compare/7564949a56b533b9d955ff5feee75afd18e51f74...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 6, 2024

@vnkozlov Pushed as commit 33fd6ae.

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

@vnkozlov vnkozlov deleted the 8333622 branch June 6, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants