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

8293232: Fix race condition in pkcs11 SessionManager #1797

Closed

Conversation

zzambers
Copy link
Contributor

@zzambers zzambers commented Mar 9, 2023

Backport - fix for race condition in pkcs11 SessionManager.

Clean. Passed jdk_security tests.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8293232: Fix race condition in pkcs11 SessionManager

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1797/head:pull/1797
$ git checkout pull/1797

Update a local copy of the PR:
$ git checkout pull/1797
$ git pull https://git.openjdk.org/jdk11u-dev pull/1797/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1797

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1797.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 9, 2023

👋 Welcome back zzambers! 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 changed the title Backport 67f31bb90b62fafc71e18c4c10e0f7e1b6896dc4 8293232: Fix race condition in pkcs11 SessionManager Mar 9, 2023
@openjdk
Copy link

openjdk bot commented Mar 9, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Mar 9, 2023

@zzambers This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8293232: Fix race condition in pkcs11 SessionManager

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

  • 479ddb6: 8280703: CipherCore.doFinal(...) causes potentially massive byte[] allocations during decryption
  • 7d89919: 8289301: P11Cipher should not throw out of bounds exception during padding
  • 80615a6: 8293815: P11PSSSignature.engineUpdate should not print debug messages during normal operation
  • 0748e2a: 8303432: Bump update version for OpenJDK: jdk-11.0.20
  • 8a726af: 8264299: Create implementation of native accessibility peer for ScrollPane and ScrollBar Java Accessibility roles
  • 915ac57: 8302000: [11u] A subtle race condition during jdk11u build
  • 125cf5a: 8295530: Update Zlib Data Compression Library to Version 1.2.13
  • de6d2c9: 8190492: Remove SSLv2Hello and SSLv3 from default enabled TLS protocols
  • 2405ca6: 8299520: TestPrintXML.java output error messages in case compare fails
  • bd9c2fb: 8290197: test/jdk/java/nio/file/Files/probeContentType/Basic.java fails on some systems for the ".rar" extension
  • ... and 1 more: https://git.openjdk.org/jdk11u-dev/compare/5802a9a92604585d5cb7ff03a26926486a50e1e8...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 9, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 9, 2023

Webrevs

@zzambers
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 10, 2023
@openjdk
Copy link

openjdk bot commented Mar 10, 2023

@zzambers
Your change (at version ef7956d) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 13, 2023

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

  • e80528b: 8282600: SSLSocketImpl should not use user_canceled workaround when not necessary
  • 479ddb6: 8280703: CipherCore.doFinal(...) causes potentially massive byte[] allocations during decryption
  • 7d89919: 8289301: P11Cipher should not throw out of bounds exception during padding
  • 80615a6: 8293815: P11PSSSignature.engineUpdate should not print debug messages during normal operation
  • 0748e2a: 8303432: Bump update version for OpenJDK: jdk-11.0.20
  • 8a726af: 8264299: Create implementation of native accessibility peer for ScrollPane and ScrollBar Java Accessibility roles
  • 915ac57: 8302000: [11u] A subtle race condition during jdk11u build
  • 125cf5a: 8295530: Update Zlib Data Compression Library to Version 1.2.13
  • de6d2c9: 8190492: Remove SSLv2Hello and SSLv3 from default enabled TLS protocols
  • 2405ca6: 8299520: TestPrintXML.java output error messages in case compare fails
  • ... and 2 more: https://git.openjdk.org/jdk11u-dev/compare/5802a9a92604585d5cb7ff03a26926486a50e1e8...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 13, 2023

@phohensee @zzambers Pushed as commit 939741c.

💡 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
backport clean integrated Pull request has been integrated
2 participants