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

8330133: libj2pkcs11.so crashes on some pkcs#11 v3.0 libraries #18789

Closed
wants to merge 2 commits into from

Conversation

valeriepeng
Copy link

@valeriepeng valeriepeng commented Apr 16, 2024

It is reported that some PKCS#11 library/vendor reports major version 3, but doesn't implement the C_GetInterface function and the resulting 'interface' variable value may be NULL and cause unexpected crash later.

This PR would check the 'interface' variable value to be non-NULL.
Reproducing this would require certain 3rd party PKCS#11 library, and thus the noreg-hard label.

Thanks~
FYI, I will be on vacation starting 4/17 and will address the review comments upon return.
Valerie


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-8330133: libj2pkcs11.so crashes on some pkcs#11 v3.0 libraries (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18789

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 16, 2024

👋 Welcome back valeriep! 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
Copy link

openjdk bot commented Apr 16, 2024

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

8330133: libj2pkcs11.so crashes on some pkcs#11 v3.0 libraries

Reviewed-by: djelinski, weijun

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

  • 76cbe48: 8329430: MetaspaceShared::preload_and_dump should clear pending exception
  • f7c8413: 8326116: JFR: Add help option to -XX:StartFlightRecording
  • 941bee1: 8327640: Allow NumberFormat strict parsing
  • 2ede143: 8330279: Typo in java.text.Bidi class description
  • 90df3b7: 8329190: (ch) DatagramChannel.receive should throw ClosedChannelException when called on closed channel
  • f11a496: 8180450: secondary_super_cache does not scale well
  • bfff02e: 8330165: C2: make superword consistently use PhaseIdealLoop::register_new_node()
  • e073d5b: 8329665: fatal error: memory leak: allocating without ResourceMark
  • 6e77d91: 8330261: Clean up linking steps
  • 61fa4d4: 8330351: Remove the SHARED_LIBRARY and STATIC_LIBRARY macros
  • ... and 8 more: https://git.openjdk.org/jdk/compare/140f56718bbbfc31bb0c39255c68568fad285a1f...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 rfr Pull request is ready for review label Apr 16, 2024
@openjdk
Copy link

openjdk bot commented Apr 16, 2024

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

  • security

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 security security-dev@openjdk.org label Apr 16, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 16, 2024

Webrevs

Copy link
Member

@djelinski djelinski left a comment

Choose a reason for hiding this comment

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

LGTM.

@@ -218,7 +218,8 @@ JNIEXPORT jobject JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_connect
p11ThrowIOException(env, "ERROR: No function list ptr found");
goto cleanup;
}
if (((CK_VERSION *)moduleData->ckFunctionListPtr)->major == 3) {
if (((CK_VERSION *)moduleData->ckFunctionListPtr)->major == 3 &&
Copy link
Member

Choose a reason for hiding this comment

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

(preexisting) you could remove the assignment in line 214 above

Copy link
Author

Choose a reason for hiding this comment

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

Yes, thanks for the comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 16, 2024
@wangweij
Copy link
Contributor

Will something similar happen on Windows too?

@valeriepeng
Copy link
Author

Will something similar happen on Windows too?

The changes cover windows as well.

@wangweij
Copy link
Contributor

Sorry, I don't know why I only saw one file change.

@valeriepeng
Copy link
Author

Thanks for the reviews!

@valeriepeng
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 16, 2024

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

  • 76cbe48: 8329430: MetaspaceShared::preload_and_dump should clear pending exception
  • f7c8413: 8326116: JFR: Add help option to -XX:StartFlightRecording
  • 941bee1: 8327640: Allow NumberFormat strict parsing
  • 2ede143: 8330279: Typo in java.text.Bidi class description
  • 90df3b7: 8329190: (ch) DatagramChannel.receive should throw ClosedChannelException when called on closed channel
  • f11a496: 8180450: secondary_super_cache does not scale well
  • bfff02e: 8330165: C2: make superword consistently use PhaseIdealLoop::register_new_node()
  • e073d5b: 8329665: fatal error: memory leak: allocating without ResourceMark
  • 6e77d91: 8330261: Clean up linking steps
  • 61fa4d4: 8330351: Remove the SHARED_LIBRARY and STATIC_LIBRARY macros
  • ... and 8 more: https://git.openjdk.org/jdk/compare/140f56718bbbfc31bb0c39255c68568fad285a1f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 16, 2024

@valeriepeng Pushed as commit d1c6cd1.

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

@valeriepeng valeriepeng deleted the JDK-8330133 branch April 16, 2024 22:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated security security-dev@openjdk.org
3 participants