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

8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null #2829

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Aug 28, 2024


Progress

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

Issue

  • JDK-8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2829

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 28, 2024

👋 Welcome back mbaesken! 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 Aug 28, 2024

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

8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null

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

  • 3248a61: 8339548: GHA: RISC-V: Use Debian snapshot archive for bootstrap
  • 51395cf: 8326611: Clean up vmTestbase/nsk/stress/stack tests
  • 81ad499: 8294726: Update URLs in minefield tests
  • 98586bb: 8331626: unsafe.cpp:162:38: runtime error in index_oop_from_field_offset_long - applying non-zero offset 4563897424 to null pointer
  • d92d633: 8332720: ubsan: instanceKlass.cpp:3550:76: runtime error: member call on null pointer of type 'struct Array'
  • 91849bf: Merge
  • f95f7f4: 8338696: (fs) BasicFileAttributes.creationTime() falls back to epoch if birth time is unavailable (Linux)
  • aa46c35: 8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs
  • 6261dd7: 8339470: [17u] More defensive fix for 8163921
  • 7d82858: 8331864: Update Public Suffix List to 1cbd6e7
  • ... and 26 more: https://git.openjdk.org/jdk17u-dev/compare/6f382d1fcfb514ab11e991ceb3c94967e8cbc054...master

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 changed the title Backport be1d374bc54d43aae3b3c1feace22d38fe2156b6 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null Aug 28, 2024
@openjdk
Copy link

openjdk bot commented Aug 28, 2024

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

@openjdk openjdk bot added backport clean approval rfr Pull request is ready for review labels Aug 28, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 28, 2024

Webrevs

memcpy(innerp, ptr, len);
if (ptr != nullptr) {
memcpy(innerp, ptr, len);
}
Copy link
Member

Choose a reason for hiding this comment

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

Hmm. innerp can never be null. If anything, we should assert.

Copy link
Member

Choose a reason for hiding this comment

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

Hi,
I don't understand. First, innerp is not checked for null. Second: does the code in 17 differ to 21&head? Else we should change this to an assertion in head, first.

Copy link
Member

Choose a reason for hiding this comment

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

Hi Goetz!

innerp is the result of

  u_char* get_user_ptr() const {
    assert(_base_addr != nullptr, "Not wrapping any memory");
    return _base_addr + sizeof(GuardHeader);
  }

which cannot return null. _base_addr is the result of a malloc and we only ever enter this path if that malloc succeeded. It is also asserted at least twice.

Cheers, Thomas

Copy link
Member

Choose a reason for hiding this comment

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

Yes, but the new code checks whether "ptr" is null. That is passed in as an argument.

Copy link
Member Author

@MBaesken MBaesken Sep 13, 2024

Choose a reason for hiding this comment

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

we call
GuardedMemory::wrap_copy(no_data, 0);
This makes ptr == NULL / nullptr .
See the full backtrace here openjdk/jdk#19382
It is a clean backport so should be the same in 17. The check was added to handle to no_data / length 0 case .

Copy link
Member

Choose a reason for hiding this comment

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

Okay, I just misread the code. Sorry for the confusion, I was too tired.

@GoeLin
Copy link
Member

GoeLin commented Sep 12, 2024

GHA failure: ClhsdbFindPC is known to fail in GHA on mac aarch. Here we see a different error situation, the test times out. But this surely is unrelated to this fix.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Sep 12, 2024
@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 13, 2024

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

  • 81b2c8d: 8286160: (fs) Files.exists returns unexpected results with C:\pagefile.sys because it's not readable
  • 6f99109: 8331405: Shenandoah: Optimize ShenandoahLock with TTAS
  • 3248a61: 8339548: GHA: RISC-V: Use Debian snapshot archive for bootstrap
  • 51395cf: 8326611: Clean up vmTestbase/nsk/stress/stack tests
  • 81ad499: 8294726: Update URLs in minefield tests
  • 98586bb: 8331626: unsafe.cpp:162:38: runtime error in index_oop_from_field_offset_long - applying non-zero offset 4563897424 to null pointer
  • d92d633: 8332720: ubsan: instanceKlass.cpp:3550:76: runtime error: member call on null pointer of type 'struct Array'
  • 91849bf: Merge
  • f95f7f4: 8338696: (fs) BasicFileAttributes.creationTime() falls back to epoch if birth time is unavailable (Linux)
  • aa46c35: 8337664: Distrust TLS server certificates issued after Oct 2024 and anchored by Entrust Root CAs
  • ... and 28 more: https://git.openjdk.org/jdk17u-dev/compare/6f382d1fcfb514ab11e991ceb3c94967e8cbc054...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 13, 2024

@MBaesken Pushed as commit 7161e29.

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

3 participants