Navigation Menu

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 #705

Closed

Conversation

zzambers
Copy link
Contributor

@zzambers zzambers commented Sep 21, 2022

Backport - fix for race condition in pkcs11 SessionManager.

Applied cleanly. 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/jdk17u-dev pull/705/head:pull/705
$ git checkout pull/705

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 705

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 21, 2022

👋 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 1e031e6a5886fba3009d8e5fa62416fe15a901b6 8293232: Fix race condition in pkcs11 SessionManager Sep 21, 2022
@openjdk
Copy link

openjdk bot commented Sep 21, 2022

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

@openjdk
Copy link

openjdk bot commented Sep 21, 2022

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

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

  • 0c551b6: 8285612: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java
  • 6230aa8: 8286551: JDK-8286460 causes tests to fail to compile in Tier2
  • 3b48de5: 8286460: Remove dependence on JAR filename in CDS tests
  • a0ccdbf: 8275234: java/awt/GraphicsDevice/DisplayModes/CycleDMImage.java is entered twice in ProblemList
  • ae5f2de: 8292816: GPL Classpath exception missing from assemblyprefix.h
  • f5c0fc3: 8288377: [REDO] DST not applying properly with zone id offset set with TZ env variable
  • ab6f746: 8293828: JFR: jfr/event/oldobject/TestClassLoaderLeak.java still fails when GC cycles are not happening
  • 5db0eea: 8285698: Create a test to check the focus stealing of JPopupMenu from JComboBox
  • eeb4562: 8284980: Test vmTestbase/nsk/stress/except/except010.java times out with -Xcomp -XX:+DeoptimizeALot
  • 4efb85f: 8286263: compiler/c1/TestPinnedIntrinsics.java failed with "RuntimeException: testCurrentTimeMillis failed with -3"
  • ... and 18 more: https://git.openjdk.org/jdk17u-dev/compare/8c5cb310e3d355c85a200235d8dc0db58b9e1a05...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 Sep 21, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 21, 2022

Webrevs

@zzambers
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 27, 2022
@openjdk
Copy link

openjdk bot commented Sep 27, 2022

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

@GoeLin
Copy link
Member

GoeLin commented Oct 3, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 3, 2022

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

  • 3bcdb66: 8293578: Duplicate ldc generated by javac
  • beb2ca2: 8283059: Uninitialized warning in check_code.c with GCC 11.2
  • 796628e: 8287076: Document.normalizeDocument() produces different results
  • 461c6e8: 8285836: sun/net/www/http/KeepAliveCache/KeepAliveProperty.java failed with "RuntimeException: Failed in server"
  • 1b98800: 8289559: java/awt/a11y/AccessibleJPopupMenuTest.java test fails with java.lang.NullPointerException
  • 14d7e3c: 8287425: Remove unnecessary register push for MacroAssembler::check_klass_subtype_slow_path
  • 7425564: 8293808: mscapi destroyKeyContainer enhance KeyStoreException: Access is denied exception
  • fa8feb4: 8290532: Adjust PKCS11Exception and handle more PKCS11 error codes
  • 4ea5526: 8282777: Create a Regression test for JDK-4515031
  • f49ffca: 8286772: java/awt/dnd/DropTargetInInternalFrameTest/DropTargetInInternalFrameTest.html times out and fails in Windows
  • ... and 39 more: https://git.openjdk.org/jdk17u-dev/compare/8c5cb310e3d355c85a200235d8dc0db58b9e1a05...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 3, 2022
@openjdk openjdk bot closed this Oct 3, 2022
@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 Oct 3, 2022
@openjdk
Copy link

openjdk bot commented Oct 3, 2022

@GoeLin @zzambers Pushed as commit 67f31bb.

💡 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