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

8309727: Assert privileges while reading the jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK system property #14392

Closed
wants to merge 3 commits into from

Conversation

ChrisHegarty
Copy link
Member

@ChrisHegarty ChrisHegarty commented Jun 9, 2023

A trivial use of the Vector API when run with the security manager and a domain that does not grant permissions fails with java.security.AccessControlException: access denied ("java.util.PropertyPermission" "jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK" "read").

The fix it minimal, as consistent with other system property access in the JDK - just access the property while asserting privileged. Note: no explicit permission grant to the vector module is required, as it is in the boot loader.

This is the only such security manager related issue I see in this code, and I have looked.


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-8309727: Assert privileges while reading the jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK system property (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14392

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 9, 2023

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

@@ -28,6 +28,8 @@
/**
* @test
* @modules jdk.incubator.vector
* @run main VectorRuns
* @run main/othervm/java.security.policy=empty_security.policy VectorRuns
Copy link
Member Author

Choose a reason for hiding this comment

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

I just added a minimal test here, so as not to otherwise disturb other areas. This is sufficient to very the fix, and ensure that it does not reoccur.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 9, 2023
@@ -68,7 +70,7 @@ static int countRunAscendingVector(int[] a) {
if (r >= a.length)
return a.length;

int length = a.length & (species.length() - 1);
int length = a.length & ~(species.length() - 1);
Copy link
Member Author

Choose a reason for hiding this comment

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

pre existing test issue.

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

@ChrisHegarty To determine the appropriate audience for reviewing this pull request, one or more labels corresponding to different subsystems will normally be applied automatically. However, no automatic labelling rule matches the changes in this pull request. In order to have an "RFR" email sent to the correct mailing list, you will need to add one or more applicable labels manually using the /label pull request command.

Applicable Labels
  • build
  • client
  • compiler
  • core-libs
  • graal
  • hotspot
  • hotspot-compiler
  • hotspot-gc
  • hotspot-jfr
  • hotspot-runtime
  • i18n
  • ide-support
  • javadoc
  • jdk
  • jmx
  • kulla
  • net
  • nio
  • security
  • serviceability
  • shenandoah

@ChrisHegarty
Copy link
Member Author

/label core-libs

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jun 9, 2023
@openjdk
Copy link

openjdk bot commented Jun 9, 2023

@ChrisHegarty
The core-libs label was successfully added.

@ChrisHegarty
Copy link
Member Author

@PaulSandoz We just ran into this yesterday, elastic/elasticsearch#96715. The change here is trivial.

@mlbridge
Copy link

mlbridge bot commented Jun 9, 2023

Webrevs

Copy link
Contributor

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

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

8309727: Assert privileges while reading the jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK system property

Reviewed-by: rriggs, uschindler, psandoz

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

  • 7d6f97d: 8309673: Refactor ref_at methods in SA ConstantPool
  • 7a970b2: 8309310: Update --release 21 symbol information for JDK 21 build 26
  • 84184f9: 8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not get expected IllegalThreadStateException on a StepRequest.enable()"
  • 679a6d8: 8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options
  • 6cd370e: 8305645: System Tray icons get corrupted when Windows primary monitor changes
  • a48bcf3: 8308336: Test java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java failed: java.net.BindException: Address already in use
  • c052756: 8282797: CompileCommand parsing errors should exit VM
  • dc842e8: 8309665: Simplify Arrays.copyOf/-Range methods
  • 3070856: 8309702: Exclude java/lang/ScopedValue/StressStackOverflow.java from JTREG_TEST_THREAD_FACTORY=Virtual runs
  • 97df6cf: 8309545: Thread.interrupted from virtual thread needlessly resets interrupt status
  • ... and 7 more: https://git.openjdk.org/jdk/compare/bb966827ac445d805bac5005d0fbda0c61111252...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 added the ready Pull request is ready to be integrated label Jun 9, 2023
@uschindler
Copy link
Member

Thanks @ChrisHegarty for fixing. Lucene's tests didn't find this, unfortunately!

@uschindler
Copy link
Member

Here is our Lucene workaround: apache/lucene#12362

@ChrisHegarty
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 9, 2023

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

  • 7d6f97d: 8309673: Refactor ref_at methods in SA ConstantPool
  • 7a970b2: 8309310: Update --release 21 symbol information for JDK 21 build 26
  • 84184f9: 8232839: JDI AfterThreadDeathTest.java failed due to "FAILED: Did not get expected IllegalThreadStateException on a StepRequest.enable()"
  • 679a6d8: 8309303: jdk/internal/misc/VM/RuntimeArguments test ignores jdk/internal/vm/options
  • 6cd370e: 8305645: System Tray icons get corrupted when Windows primary monitor changes
  • a48bcf3: 8308336: Test java/net/HttpURLConnection/HttpURLConnectionExpectContinueTest.java failed: java.net.BindException: Address already in use
  • c052756: 8282797: CompileCommand parsing errors should exit VM
  • dc842e8: 8309665: Simplify Arrays.copyOf/-Range methods
  • 3070856: 8309702: Exclude java/lang/ScopedValue/StressStackOverflow.java from JTREG_TEST_THREAD_FACTORY=Virtual runs
  • 97df6cf: 8309545: Thread.interrupted from virtual thread needlessly resets interrupt status
  • ... and 7 more: https://git.openjdk.org/jdk/compare/bb966827ac445d805bac5005d0fbda0c61111252...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 9, 2023

@ChrisHegarty Pushed as commit cee5724.

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

@ChrisHegarty ChrisHegarty deleted the vector_sm branch June 9, 2023 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants