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

8333887: ubsan: unsafe.cpp:247:13: runtime error: store to null pointer of type 'volatile int' #837

Closed
wants to merge 2 commits into from

Conversation

luwang1103
Copy link
Contributor

@luwang1103 luwang1103 commented Jul 12, 2024

hi @shipilev ,

This pull request contains a backport of commit 0d3a3771 from the master repository.

The commit being backported was authored by Matthias Baesken on 13 Jun 2024.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8333887 needs maintainer approval

Issue

  • JDK-8333887: ubsan: unsafe.cpp:247:13: runtime error: store to null pointer of type 'volatile int' (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/837/head:pull/837
$ git checkout pull/837

Update a local copy of the PR:
$ git checkout pull/837
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/837/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 837

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/837.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 12, 2024

👋 Welcome back luwang1103! 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 12, 2024

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

8333887: ubsan: unsafe.cpp:247:13: runtime error: store to null pointer of type 'volatile int'

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 17 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 0d3a3771c3777d3dd1fec8dc8faed5fd02b06830 8333887: ubsan: unsafe.cpp:247:13: runtime error: store to null pointer of type 'volatile int' Jul 12, 2024
@openjdk
Copy link

openjdk bot commented Jul 12, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 12, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 12, 2024

Webrevs

@shipilev
Copy link
Member

shipilev commented Jul 12, 2024

Why bots do not think this is clean? The indenting is not the same as in original patch? Fix up the indenting and force-push.

@shipilev
Copy link
Member

Hm, where is copyright header update comes from? This is confusing...

To be extra clear, this PR should be exactly like the upstream change: openjdk/jdk@0d3a377, unless there is a good reason to deviate. The indentation is still not fixed, AFAICS. How do you do the backports? Picking up and applying the full changsets, or making the patch by hand?

@luwang1103
Copy link
Contributor Author

Hm, where is copyright header update comes from? This is confusing...

To be extra clear, this PR should be exactly like the upstream change: openjdk/jdk@0d3a377, unless there is a good reason to deviate. The indentation is still not fixed, AFAICS. How do you do the backports? Picking up and applying the full changsets, or making the patch by hand?

In the master repository, there are other modifications to unsafe.cpp. Other modifications do not belong to this bug. What should I do next? This is my first time submitting code, and there are many areas that I am currently studying. Thank you for your guidance.

@shipilev
Copy link
Member

Other modifications do not belong to this bug. What should I do next?

Right, so indenting for surrounding code had changed a bit. This is fine, we can make this one into unclean backport.

To proceed, I think you need to:

  1. Drop the copyright year change from this PR.
  2. Match the indenting of the original changeset: #if block should start a column 0.

@shipilev
Copy link
Member

@openjdk
Copy link

openjdk bot commented Jul 12, 2024

@luwang1103 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@shipilev
Copy link
Member

Spot the difference, this is original change:

  // we use this method at some places for writing to 0 e.g. to cause a crash;
  // ubsan does not know that this is the desired behavior
#if defined(__clang__) || defined(__GNUC__)
__attribute__((no_sanitize("undefined")))
#endif

Current PR misses two spaces before // comments:

// we use this method at some places for writing to 0 e.g. to cause a crash;
// ubsan does not know that this is the desired behavior
#if defined(__clang__) || defined(__GNUC__)
__attribute__((no_sanitize("undefined")))
#endif

This might sound like odd thing to get right, but matching the indenting exactly would make your follow-up backport in the same place clean. Make sure you have the new hunks exactly the same.

@openjdk
Copy link

openjdk bot commented Jul 15, 2024

@luwang1103 Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk openjdk bot added the clean label Jul 15, 2024
@openjdk
Copy link

openjdk bot commented Jul 15, 2024

⚠️ @luwang1103 This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@luwang1103
Copy link
Contributor Author

/approval request The code applies cleanly. Low risk: It is a corner case which is not triggered by the current code. In order to avoid bugs in the future, it is good to backport it.

@openjdk
Copy link

openjdk bot commented Jul 15, 2024

@luwang1103
8333887: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jul 15, 2024
@openjdk
Copy link

openjdk bot commented Jul 18, 2024

⚠️ @luwang1103 the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout ubsan-third
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jul 18, 2024
@luwang1103
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 18, 2024
@openjdk
Copy link

openjdk bot commented Jul 18, 2024

@luwang1103
Your change (at version ec5c744) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 18, 2024

Going to push as commit 9a02aa6.
Since your change was applied there have been 18 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 18, 2024
@openjdk openjdk bot closed this Jul 18, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jul 18, 2024
@openjdk
Copy link

openjdk bot commented Jul 18, 2024

@shipilev @luwang1103 Pushed as commit 9a02aa6.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants