8308445: Linker should check that capture state segment is big enough #14339

JornVernee · 2023-06-06T16:22:41Z

Fix the bug mentioned in the JBS issue.

The implementation is updated to slice the capture state segment using the capture state layout. This checks both that the segment is big enough, and that it is properly aligned.

Additionally, I added a check for MS::NULL since this is also an illegal value we can catch early.

Test cases are added for all three invalid values.

Testing: jdk_foreign test suite.

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-8308445: Linker should check that capture state segment is big enough (Bug - "3")

Reviewers

Maurizio Cimadamore (@mcimadamore - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14339

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-06-06T16:27:28Z

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

openjdk · 2023-06-06T16:55:33Z

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

core-libs

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.

mlbridge · 2023-06-06T17:01:25Z

Webrevs

01: Full - Incremental (9200f57f)
00: Full (ccc35e63)

mcimadamore · 2023-06-06T17:13:23Z

src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java

@@ -110,6 +111,8 @@ public void close() {
                    methodType(void.class, Object.class));
            MH_CHECK_SYMBOL = lookup.findStatic(SharedUtils.class, "checkSymbol",
                    methodType(void.class, MemorySegment.class));
+            MH_SLICE_CAPTURE_SEGMENT = lookup.findStatic(SharedUtils.class, "checkCaptureSegment",


Is the name of the field correct?

That's a leftover from an earlier version, will fix

mcimadamore · 2023-06-06T17:15:30Z

test/jdk/java/foreign/capturecallstate/TestCaptureCallState.java

+        return new Object[][]{
+            {Arena.ofAuto().allocate(1), IndexOutOfBoundsException.class, ".*Out of bound access on segment.*"},
+            {MemorySegment.NULL, IllegalArgumentException.class, ".*Capture segment is NULL.*"},
+            {Arena.ofAuto().allocate(Linker.Option.captureStateLayout().byteSize() + 3).asSlice(3), // misaligned


This last one is very nice!

mcimadamore

Looks good

openjdk · 2023-06-06T17:17:21Z

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

8308445: Linker should check that capture state segment is big enough

Reviewed-by: mcimadamore

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

749d480: 8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
3ccb3c0: 8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address
a25b7b8: 8295976: GetThreadListStackTraces returns wrong state for blocked VirtualThread
fadcd65: 8309527: Improve test proxy performance
0ed4af7: 8309472: IGV: Add dump_igv(custom_name) for improved debugging
f1c7afc: 8306647: Implementation of Structured Concurrency (Preview)
a08c5cb: 8307953: [AIX] C locale's font setting was changed by JEP 400
0ceb432: 8309570: ProblemList sun/security/pkcs11/Signature/TestRSAKeyLength.java
65bdbc7: 8309396: com/sun/jdi/JdbMethodExitTest.java fails with virtual threads due to a bug in determining the main thread id
4a75fd4: 8301553: Support Password-Based Cryptography in SunPKCS11
... and 10 more: https://git.openjdk.org/jdk/compare/9188142698d8fdcee43c0b0519fde5c63b0010f8...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-06-07T12:24:32Z

/integrate

openjdk · 2023-06-07T12:25:30Z

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

fa79111: 8308031: Linkers should reject unpromoted variadic parameters
16ebf47: 8309594: Cleanup naming in JavacParser related to unnamed classes
5722903: 8307374: Add a JFR event for tracking RSS
1de40f3: 8302145: ddepth should be uint in PhaseIdealLoop::register_node()
a6726b6: 8309568: javac crashes attempting to -Xprint on a class file of an unnamed class
8cdd95e: 8305959: x86: Improve itable_stub
9233dcc: 8309297: Adjust ShenandoahHeap print_heap_regions_on
749d480: 8305763: Parsing a URI with an underscore goes through a silent exception, negatively impacting performance
3ccb3c0: 8305906: HttpClient may use incorrect key when finding pooled HTTP/2 connection for IPv6 address
a25b7b8: 8295976: GetThreadListStackTraces returns wrong state for blocked VirtualThread
... and 17 more: https://git.openjdk.org/jdk/compare/9188142698d8fdcee43c0b0519fde5c63b0010f8...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-06-07T12:25:38Z

@JornVernee Pushed as commit c49129f.

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

Apply checks on capture state segment

ccc35e6

openjdk bot added the core-libs core-libs-dev@openjdk.org label Jun 6, 2023

JornVernee marked this pull request as ready for review June 6, 2023 16:56

openjdk bot added the rfr Pull request is ready for review label Jun 6, 2023

mcimadamore reviewed Jun 6, 2023

View reviewed changes

rename MH field

9200f57

mcimadamore reviewed Jun 6, 2023

View reviewed changes

mcimadamore approved these changes Jun 6, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 6, 2023

mcimadamore approved these changes Jun 7, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jun 7, 2023

openjdk bot closed this Jun 7, 2023

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

JornVernee deleted the CapSegmentSize branch June 7, 2023 12:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8308445: Linker should check that capture state segment is big enough #14339

8308445: Linker should check that capture state segment is big enough #14339

Uh oh!

JornVernee commented Jun 6, 2023 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Jun 6, 2023

Uh oh!

openjdk bot commented Jun 6, 2023

Uh oh!

mlbridge bot commented Jun 6, 2023 •

edited

Loading

Uh oh!

mcimadamore Jun 6, 2023

Uh oh!

JornVernee Jun 6, 2023

Uh oh!

mcimadamore Jun 6, 2023

Uh oh!

mcimadamore left a comment

Uh oh!

openjdk bot commented Jun 6, 2023 •

edited

Loading

Uh oh!

JornVernee commented Jun 7, 2023

Uh oh!

openjdk bot commented Jun 7, 2023

Uh oh!

openjdk bot commented Jun 7, 2023

Uh oh!

Uh oh!

8308445: Linker should check that capture state segment is big enough #14339

8308445: Linker should check that capture state segment is big enough #14339

Uh oh!

Conversation

JornVernee commented Jun 6, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Jun 6, 2023

Uh oh!

openjdk bot commented Jun 6, 2023

Uh oh!

mlbridge bot commented Jun 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

mcimadamore Jun 6, 2023

Choose a reason for hiding this comment

Uh oh!

JornVernee Jun 6, 2023

Choose a reason for hiding this comment

Uh oh!

mcimadamore Jun 6, 2023

Choose a reason for hiding this comment

Uh oh!

mcimadamore left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Jun 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JornVernee commented Jun 7, 2023

Uh oh!

openjdk bot commented Jun 7, 2023

Uh oh!

openjdk bot commented Jun 7, 2023

Uh oh!

Uh oh!

JornVernee commented Jun 6, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 6, 2023 •

edited

Loading

openjdk bot commented Jun 6, 2023 •

edited

Loading