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

8263743: redundant lock in SSLSocketImpl #3053

Closed
wants to merge 1 commit into from

Conversation

XueleiFan
Copy link
Member

@XueleiFan XueleiFan commented Mar 17, 2021

Remove redundant lock in SSLSocketImpl.

In the SSLSocketImpl, there is a socket level lock while reading application data (see readApplicationRecord).

                socketLock.lock(); 
                try { 
                    plainText = decode(buffer); 
                } finally { 
                    socketLock.unlock(); 
                } 

If an application data read is in progress, other calling to SSLSocket APIs (for example getUseClientMode() in a handshake complete listener) could be blocked if socket level locks are used.

No new regression test. Simple fix, hard to trigger the deadlock.


Progress

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

Issue

Reviewers

Download

To checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3053/head:pull/3053
$ git checkout pull/3053

To update a local copy of the PR:
$ git checkout pull/3053
$ git pull https://git.openjdk.java.net/jdk pull/3053/head

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 17, 2021

👋 Welcome back xuelei! 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 Mar 17, 2021
@openjdk
Copy link

openjdk bot commented Mar 17, 2021

@XueleiFan 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 Mar 17, 2021
@mlbridge
Copy link

mlbridge bot commented Mar 17, 2021

Webrevs

@XueleiFan
Copy link
Member Author

XueleiFan commented Mar 25, 2021

ping ...

jnimeh
jnimeh approved these changes Mar 25, 2021
Copy link
Member

@jnimeh jnimeh left a comment

After reading over the description in the bug I think this looks fine.

@openjdk
Copy link

openjdk bot commented Mar 25, 2021

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

8263743: redundant lock in SSLSocketImpl

Reviewed-by: jnimeh

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

  • 3fcb499: 8263768: JFormattedTextField.AbstractFormatter.getDocumentFilter()/getNavigationFilter() spec doesn't mention what the default impls return and what does it mean
  • 4155533: 8258753: StartTlsResponse.close() hangs due to synchronization issues
  • 3e18330: 8264018: AArch64: NEON loadV2 and storeV2 addressing is wrong
  • 0ff8168: 8258957: DocLint: check for HTML start element at end of body
  • 3d7f912: 8220266: add support for additional metadata in add/remove programs
  • 37f494c: 8260619: Add final modifier to several DataFlavor static fields
  • cfc9aa3: 8264002: Delete outdated assumptions about ColorSpace initialization
  • 623f0b6: 8262235: Remove unnecessary logic in hugetlbfs_sanity_check()
  • 1a13c9e: 8263473: Update annotation terminology (2)
  • 3e751a5: 8263198: javadoc HELP page
  • ... and 126 more: https://git.openjdk.java.net/jdk/compare/cdf78e47c407697487bd2632b5aef6acd952d79e...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 Mar 25, 2021
@XueleiFan
Copy link
Member Author

XueleiFan commented Mar 25, 2021

/integrate

@openjdk openjdk bot closed this Mar 25, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 25, 2021
@openjdk
Copy link

openjdk bot commented Mar 25, 2021

@XueleiFan Since your change was applied there have been 136 commits pushed to the master branch:

  • 3fcb499: 8263768: JFormattedTextField.AbstractFormatter.getDocumentFilter()/getNavigationFilter() spec doesn't mention what the default impls return and what does it mean
  • 4155533: 8258753: StartTlsResponse.close() hangs due to synchronization issues
  • 3e18330: 8264018: AArch64: NEON loadV2 and storeV2 addressing is wrong
  • 0ff8168: 8258957: DocLint: check for HTML start element at end of body
  • 3d7f912: 8220266: add support for additional metadata in add/remove programs
  • 37f494c: 8260619: Add final modifier to several DataFlavor static fields
  • cfc9aa3: 8264002: Delete outdated assumptions about ColorSpace initialization
  • 623f0b6: 8262235: Remove unnecessary logic in hugetlbfs_sanity_check()
  • 1a13c9e: 8263473: Update annotation terminology (2)
  • 3e751a5: 8263198: javadoc HELP page
  • ... and 126 more: https://git.openjdk.java.net/jdk/compare/cdf78e47c407697487bd2632b5aef6acd952d79e...master

Your commit was automatically rebased without conflicts.

Pushed as commit a678a38.

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

@XueleiFan XueleiFan deleted the JDK-8263743 branch Mar 28, 2021
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
2 participants