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

8300079: SIGSEGV in LibraryCallKit::inline_string_copy due to constant NULL src argument #12112

Closed
wants to merge 5 commits into from

Conversation

TobiHartmann
Copy link
Member

@TobiHartmann TobiHartmann commented Jan 20, 2023

The StringUTF16.compress variant of LibraryCallKit::inline_string_copy does not properly handle a constant null src argument that can happen when the char[] data argument of String::copyValueOf is null:

public static String copyValueOf(char[] data, int offset, int count) {
return new String(data, offset, count);
->
public String(char[] value, int offset, int count) {
this(value, offset, count, rangeCheck(value, offset, count));
->
String(char[] value, int off, int len, Void sig) {
if (len == 0) {
this.value = "".value;
this.coder = "".coder;
return;
}
if (COMPACT_STRINGS) {
byte[] val = StringUTF16.compress(value, off, len);

Although the intrinsified code is never executed because we throw a NullPointerException from (non-inlined) rangeCheck, we need to make sure a constant null is properly handled.

I manually inspected similar C2 intrinsics and found another potential issue in LibraryCallKit::inline_mulAdd where we should call must_be_not_null on in as well (even if it might not be possible with current code, let's better be safe than sorry).

All the other changes are simple refactorings for better readability.

Thanks,
Tobias


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-8300079: SIGSEGV in LibraryCallKit::inline_string_copy due to constant NULL src argument

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12112

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 20, 2023

👋 Welcome back thartmann! 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 openjdk bot added the rfr Pull request is ready for review label Jan 20, 2023
@openjdk
Copy link

openjdk bot commented Jan 20, 2023

@TobiHartmann 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 Jan 20, 2023
Copy link
Contributor

@rwestrel rwestrel 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
Copy link

openjdk bot commented Jan 20, 2023

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

8300079: SIGSEGV in LibraryCallKit::inline_string_copy due to constant NULL src argument

Reviewed-by: roland, chagedorn, kvn

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

  • facd415: 8297757: VarHandles.getStaticFieldFromBaseAndOffset should get the receiver type from VarHandle
  • e803855: 8299863: URLFromURITest.java should import org.junit.jupiter.api.Test
  • 92d8326: 8299827: Add resolved IP address in connection exception for sockets
  • c6d5600: 8038146: Clarify Map.Entry's connection to the underlying map
  • b2d3622: 8299896: Reduce enum values of HtmlLinkInfo.Kind
  • 623ba5b: 8300653: G1EvacInfo should use common naming scheme for collection set
  • 97c611d: 8289748: C2 compiled code crashes with SIGFPE with -XX:+StressLCM and -XX:+StressGCM
  • 4562b40: 8300682: InstanceKlassMiscStatus is a bad name

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 ready Pull request is ready to be integrated label Jan 20, 2023
@TobiHartmann
Copy link
Member Author

Thanks for the review, Roland!

@TobiHartmann
Copy link
Member Author

Being paranoid, I double-checked my refactoring and noticed several Value calls with a wrong receiver. Turns out that has always been wrong. I fixed it.

@mlbridge
Copy link

mlbridge bot commented Jan 20, 2023

Webrevs

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!

Comment on lines -5711 to -5713
const Type* n_type = a->Value(&_gvn);
const TypeAryPtr* top_n = n_type->isa_aryptr();
const Type* m_type = a->Value(&_gvn);
Copy link
Member

Choose a reason for hiding this comment

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

Good catch!

@TobiHartmann
Copy link
Member Author

Thanks, Christian!

Copy link
Contributor

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

@TobiHartmann
Copy link
Member Author

Thanks, Vladimir!

@TobiHartmann
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 23, 2023

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

  • 030b071: 8300207: Add a pre-check for the number of canonical equivalent permutations in j.u.r.Pattern
  • 7ced08d: 8300638: Tier1 IR Test failure after JDK-8298632 on macosx-x64-debug
  • 3ea4eac: 8300817: The build is broken after JDK-8294693
  • cbfc069: 8300731: Avoid unnecessary array fill after creation in PaletteBuilder
  • 67b1c89: 8294693: Add Collections.shuffle overload that accepts RandomGenerator interface
  • c8dd758: 8300260: Remove metaprogramming/isSame.hpp
  • a6c2a2a: 8300692: GCC 12 reports some compiler warnings in bundled freetype
  • bb42e61: 8300493: Use ArraysSupport.vectorizedHashCode in j.u.zip.ZipCoder
  • 06394ee: 8300590: [JVMCI] BytecodeFrame.equals is broken
  • 5331a3e: 8298908: Instrument Metaspace for ASan
  • ... and 12 more: https://git.openjdk.org/jdk/compare/26410c180b88b4342217fdad63f1221786d8c37b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 23, 2023

@TobiHartmann Pushed as commit 45e4e00.

💡 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
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
4 participants