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

8321159: SymbolLookup.libraryLookup(Path, Arena) Assumes default Filesystem #16944

Closed
wants to merge 6 commits into from

Conversation

minborg
Copy link
Contributor

@minborg minborg commented Dec 4, 2023

This PR proposes to reject paths provided to the SymbolLookup.libraryLookup(Path path, Arena arena) method if a path is not in the default file system.


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
  • Change requires CSR request JDK-8321386 to be approved

Issues

  • JDK-8321159: SymbolLookup.libraryLookup(Path, Arena) Assumes default Filesystem (Bug - P4)
  • JDK-8321386: SymbolLookup.libraryLookup(Path, Arena) Assumes default Filesystem (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16944

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 4, 2023

👋 Welcome back pminborg! 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 Dec 4, 2023
@openjdk
Copy link

openjdk bot commented Dec 4, 2023

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

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Dec 4, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 4, 2023

Webrevs

return FileSystems.newFileSystem(URI.create(parts[0]), new HashMap<>());
}
}
throw new AssertionError("Unable to create file system from " + clazz);
Copy link
Contributor

Choose a reason for hiding this comment

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

Using a class from testng.jar is a good idea. An alternative to decoding the composite URL is to use the code source from the protection domain, e.g.

URI uri = clazz.getProtectionDomain().getCodeSource().getLocation().toURI();
return FileSystems.newFileSystem(Path.of(uri));

Comment on lines 287 to 288
* @throws IllegalArgumentException if {@code path} is not in the default file system
* or if {@code path} does not point to a valid library
Copy link
Member

Choose a reason for hiding this comment

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

Please split this into separate @throws IllegalArgumentException tags, as that is what we do everywhere else in the FFM API.

Copy link
Contributor

Choose a reason for hiding this comment

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

It depends on the wording. If changed to something like "not a path to a valid library in the default file system" then it avoid describing it as two cases.

@@ -292,6 +294,9 @@ static SymbolLookup libraryLookup(String name, Arena arena) {
static SymbolLookup libraryLookup(Path path, Arena arena) {
Reflection.ensureNativeAccess(Reflection.getCallerClass(),
SymbolLookup.class, "libraryLookup");
if (!(path.getFileSystem() == FileSystems.getDefault())) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be written as path.getFileSystem() != FileSystems.getDefault() ?

@mcimadamore
Copy link
Contributor

Note: this issue needs a CSR

@minborg
Copy link
Contributor Author

minborg commented Dec 5, 2023

/csr

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Dec 5, 2023
@openjdk
Copy link

openjdk bot commented Dec 5, 2023

@minborg has indicated that a compatibility and specification (CSR) request is needed for this pull request.

@minborg please create a CSR request for issue JDK-8321159 with the correct fix version. This pull request cannot be integrated until the CSR request is approved.

@openjdk
Copy link

openjdk bot commented Dec 5, 2023

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

8321159: SymbolLookup.libraryLookup(Path, Arena) Assumes default Filesystem

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

  • 18c7922: 8321224: ct.sym for JDK 22 contains references to internal modules
  • 83ffc1a: 8320303: Allow PassFailJFrame to accept single window creator
  • fd31f6a: 8321183: Incorrect warning from cds about the modules file
  • 027b5db: 8321215: Incorrect x86 instruction encoding for VSIB addressing mode
  • 61d0db3: 8318468: compiler/tiered/LevelTransitionTest.java fails with -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
  • 87516e2: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch
  • 800f347: 8321216: SerialGC attempts to access the card table beyond the end of the heap during card table scan
  • a1fe16b: 8321300: Cleanup TestHFA
  • 5b02188: 8321105: Enable UseCryptoPmullForCRC32 for Neoverse V2
  • 4fbf22b: 8320652: ThreadInfo.isInNative needs to be updated to say what executing native code means
  • ... and 26 more: https://git.openjdk.org/jdk/compare/2b00ac0d02a110326846c75ea7ea535dccbb1924...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 ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Dec 5, 2023
@minborg
Copy link
Contributor Author

minborg commented Dec 6, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 6, 2023

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

  • 9d77677: 8321124: java/util/stream/GatherersTest.java times out
  • 4c96aac: 8320935: Move CDS config initialization code to cdsConfig.cpp
  • 78d0958: 8321406: Null IDs should be resolved as before catalogs are added
  • aaaae3e: 8321207: javac is not accepting correct code
  • 86b27b7: 8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string
  • 3cd65ce: 8321325: Remove unused Java_java_awt_MenuComponent_initIDs function
  • 905137d: 8321219: runtime/jni/FastGetField: assert(is_interpreted_frame()) failed: interpreted frame expected
  • 430564c: 8308715: Create a mechanism for Implicitly Declared Class javadoc
  • c8fa758: 8320860: add-opens/add-exports require '=' in JAVA_TOOL_OPTIONS
  • 9e57010: 8315149: Add hsperf counters for CPU time of internal GC threads
  • ... and 43 more: https://git.openjdk.org/jdk/compare/2b00ac0d02a110326846c75ea7ea535dccbb1924...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 6, 2023

@minborg Pushed as commit a0920aa.

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