-
Notifications
You must be signed in to change notification settings - Fork 214
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
👋 Welcome back mbaesken! A progress list of the required criteria for merging this PR into |
@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:
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
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 |
This backport pull request has now been updated with issue from the original commit. |
memcpy(innerp, ptr, len); | ||
if (ptr != nullptr) { | ||
memcpy(innerp, ptr, len); | ||
} |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 .
There was a problem hiding this comment.
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.
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. |
/integrate |
Going to push as commit 7161e29.
Your commit was automatically rebased without conflicts. |
Progress
Issue
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