8320886: Unsafe_SetMemory0 is not guarded #16848

JornVernee · 2023-11-28T12:09:12Z

See JBS issue.

Guard the memory access done in Unsafe_SetMemory0 to prevent a SIGBUS error from crashing the VM when a truncated memory mapped file is accessed.

Testing: local InternalErrorTest, Tier 1-5

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-8320886: Unsafe_SetMemory0 is not guarded (Bug - P2)

Reviewers

David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to e9a5247e
Frederic Parain (@fparain - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16848

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-11-28T12:11:23Z

👋 Welcome back jvernee! 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.

franz1981 · 2023-11-28T12:12:55Z

@JornVernee please check what I have done for #16760

Maybe there is something we can pull in already on your PR here re it

openjdk · 2023-11-28T12:13:19Z

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

hotspot

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.

JornVernee · 2023-11-28T12:14:39Z

@franz1981 I can not interact with PRs that have the OCA label. Once you have signed the OCA, and it is verified (label is removed), I can take a look.

franz1981 · 2023-11-28T12:42:13Z

@JornVernee Fair point, in theory I work for Red Hair so it should be sorted out, let me ask @theRealAph about it

First contribution ever, so forgive the naive comment

JornVernee · 2023-11-28T13:08:56Z

@franz1981 No problem. I wasn't sure whether you worked for Red Hat or not. In that case, it should be enough to post a comment with /covered and then one of the community managers will create an entry for your github user name in the OCA database: https://oca.opensource.oracle.com/?ojr=contrib-list

I will stick to the policy of waiting until the OCA label is removed though :)

theRealAph · 2023-11-28T15:57:07Z

@franz1981 I can not interact with PRs that have the OCA label. Once you have signed the OCA, and it is verified (label is removed), I can take a look.

I can tell you that @franz1981 is a Red Hat employee, and we have signed the OCA for everyone here.

JornVernee · 2023-11-28T18:56:25Z

#16760 Looks more performance focused, so I think that should be addressed separately.

JornVernee · 2023-11-28T18:58:30Z

I'm looking into the crash on mac

P.S. the issue seems to be some missing cases in Assembler::locate_operand, meaning the signal handler can not find the address of the next instruction. I think we can just add the missing cases.

mlbridge · 2023-11-28T19:01:12Z

Webrevs

dholmes-ora · 2023-11-29T02:12:20Z

@JornVernee is there some "new" usage of this method such that it needs guarding? I find it interesting that in the 3+ months that the fix for JDK-8191278 was developed and reviewed, the need to include SetMemory0 was never raised once. And that was over 4 years ago.

JornVernee · 2023-11-29T08:55:50Z

@JornVernee is there some "new" usage of this method such that it needs guarding?

This function is now exposed (indirectly) through the new MemorySegment::fill API. There are some rare other uses of Unsafe.setMemory in the JDK, and some seem to be operating on user-supplied buffers, so this issue might have existed for longer already. For instance in GaloisCounterMode, but it's hard to tell for me where the ByteBuffer that this is operating on comes from.

I went through the original review thread starting here: https://mail.openjdk.org/pipermail/hotspot-dev/2019-February/037058.html but I don't see a reference to setMemory.

JornVernee · 2023-11-29T19:10:42Z

src/hotspot/cpu/x86/assembler_x86.cpp

@@ -969,7 +970,7 @@ address Assembler::locate_operand(address inst, WhichOperand which) {
      assert(which == call32_operand, "jcc has no disp32 or imm");
      return ip;
    default:
-      ShouldNotReachHere();
+      fatal("not handled: 0x0F%2X", 0xFF & *(ip-1));


I've improved the error reporting a bit here to print out the problematic instruction. I was only able to reproduce the crash through GHA.

dholmes-ora

Okay fix seems fine.

Thanks

test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java

openjdk · 2023-12-04T03:22:05Z

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

8320886: Unsafe_SetMemory0 is not guarded

Reviewed-by: dholmes, fparain

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

b270f30: 8318629: G1: Refine code a bit in G1RemSetTrackingPolicy::update_at_allocate
486594d: 8316657: Support whitebox testing in microbenchmarks
ce8399f: 8321582: yield .class not parsed correctly.
3c6459e: 8321641: ClassFile ModuleAttribute.ModuleAttributeBuilder::moduleVersion spec contains a copy-paste error
92fd490: 8321176: [Screencast] make a second attempt on screencast failure
d13302f: 8321387: SegmentAllocator:allocateFrom(AddressLayout, MemorySegment) does not throw stated UnsupportedOperationException
ce10844: 8319577: x86_64 AVX2 intrinsics for Arrays.sort methods (int, float arrays)
5c12a18: 8320790: Update --release 22 symbol information for JDK 22 build 27
7180088: 8321429: (fc) FileChannel.lock creates a FileKey containing two long index values, they could be stored as int values
0c178be: 8321206: Make Locale related system properties StaticProperty
... and 204 more: https://git.openjdk.org/jdk/compare/4bcda602668835c35e2ac6ff6702d15cd249bc2a...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.

JornVernee · 2023-12-11T13:49:52Z

/label add hotspot-runtime

openjdk · 2023-12-11T13:51:23Z

@JornVernee
The hotspot-runtime label was successfully added.

JornVernee · 2023-12-11T19:03:51Z

/integrate

openjdk · 2023-12-11T19:05:42Z

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

b270f30: 8318629: G1: Refine code a bit in G1RemSetTrackingPolicy::update_at_allocate
486594d: 8316657: Support whitebox testing in microbenchmarks
ce8399f: 8321582: yield .class not parsed correctly.
3c6459e: 8321641: ClassFile ModuleAttribute.ModuleAttributeBuilder::moduleVersion spec contains a copy-paste error
92fd490: 8321176: [Screencast] make a second attempt on screencast failure
d13302f: 8321387: SegmentAllocator:allocateFrom(AddressLayout, MemorySegment) does not throw stated UnsupportedOperationException
ce10844: 8319577: x86_64 AVX2 intrinsics for Arrays.sort methods (int, float arrays)
5c12a18: 8320790: Update --release 22 symbol information for JDK 22 build 27
7180088: 8321429: (fc) FileChannel.lock creates a FileKey containing two long index values, they could be stored as int values
0c178be: 8321206: Make Locale related system properties StaticProperty
... and 204 more: https://git.openjdk.org/jdk/compare/4bcda602668835c35e2ac6ff6702d15cd249bc2a...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-12-11T19:05:49Z

@JornVernee Pushed as commit ce4b257.

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

JornVernee · 2023-12-11T19:16:48Z

/backport jdk22

openjdk · 2023-12-11T19:19:05Z

@JornVernee the backport was successfully created on the branch backport-JornVernee-ce4b257f in my personal fork of openjdk/jdk22. To create a pull request with this backport targeting openjdk/jdk22:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ce4b257f from the openjdk/jdk repository.

The commit being backported was authored by Jorn Vernee on 11 Dec 2023 and was reviewed by David Holmes and Frederic Parain.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22:

$ git fetch https://github.com/openjdk-bots/jdk22.git backport-JornVernee-ce4b257f:backport-JornVernee-ce4b257f
$ git checkout backport-JornVernee-ce4b257f
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22.git backport-JornVernee-ce4b257f

JornVernee added 2 commits November 28, 2023 11:52

add test

616651b

fix

e05c2b9

openjdk bot added the hotspot hotspot-dev@openjdk.org label Nov 28, 2023

JornVernee marked this pull request as ready for review November 28, 2023 18:55

openjdk bot added the rfr Pull request is ready for review label Nov 28, 2023

JornVernee added 2 commits November 29, 2023 20:09

Print out instruction

e4abb14

add handling for missing instruction

e9a5247

JornVernee commented Nov 29, 2023

View reviewed changes

dholmes-ora approved these changes Dec 4, 2023

View reviewed changes

test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java Outdated Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label Dec 4, 2023

adjust whitespace

7c258f0

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Dec 11, 2023

fparain approved these changes Dec 11, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Dec 11, 2023

openjdk bot closed this Dec 11, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 11, 2023

JornVernee deleted the GuardSetMemory branch December 11, 2023 19:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8320886: Unsafe_SetMemory0 is not guarded #16848

8320886: Unsafe_SetMemory0 is not guarded #16848

JornVernee commented Nov 28, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 28, 2023

franz1981 commented Nov 28, 2023

openjdk bot commented Nov 28, 2023

JornVernee commented Nov 28, 2023

franz1981 commented Nov 28, 2023 •

edited

Loading

JornVernee commented Nov 28, 2023 •

edited

Loading

theRealAph commented Nov 28, 2023

JornVernee commented Nov 28, 2023

JornVernee commented Nov 28, 2023 •

edited

Loading

mlbridge bot commented Nov 28, 2023 •

edited

Loading

dholmes-ora commented Nov 29, 2023

JornVernee commented Nov 29, 2023

JornVernee Nov 29, 2023

dholmes-ora left a comment

openjdk bot commented Dec 4, 2023 •

edited

Loading

JornVernee commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

JornVernee commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

JornVernee commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

8320886: Unsafe_SetMemory0 is not guarded #16848

8320886: Unsafe_SetMemory0 is not guarded #16848

Conversation

JornVernee commented Nov 28, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Nov 28, 2023

franz1981 commented Nov 28, 2023

openjdk bot commented Nov 28, 2023

JornVernee commented Nov 28, 2023

franz1981 commented Nov 28, 2023 • edited Loading

JornVernee commented Nov 28, 2023 • edited Loading

theRealAph commented Nov 28, 2023

JornVernee commented Nov 28, 2023

JornVernee commented Nov 28, 2023 • edited Loading

mlbridge bot commented Nov 28, 2023 • edited Loading

Webrevs

dholmes-ora commented Nov 29, 2023

JornVernee commented Nov 29, 2023

JornVernee Nov 29, 2023

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 4, 2023 • edited Loading

JornVernee commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

JornVernee commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

JornVernee commented Dec 11, 2023

openjdk bot commented Dec 11, 2023

JornVernee commented Nov 28, 2023 •

edited by openjdk bot

Loading

franz1981 commented Nov 28, 2023 •

edited

Loading

JornVernee commented Nov 28, 2023 •

edited

Loading

JornVernee commented Nov 28, 2023 •

edited

Loading

mlbridge bot commented Nov 28, 2023 •

edited

Loading

openjdk bot commented Dec 4, 2023 •

edited

Loading