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

JDK-8293093 NPE in P11KeyStore.getID #10823

Closed
wants to merge 4 commits into from

Conversation

mcpowers
Copy link
Contributor

@mcpowers mcpowers commented Oct 21, 2022

https://bugs.openjdk.org/browse/JDK-8293093


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10823

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 21, 2022

👋 Welcome back mpowers! 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.

@mcpowers
Copy link
Contributor Author

I was finally able to reproduce this failure and was able to verify the fix. Took forever.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 21, 2022
@openjdk
Copy link

openjdk bot commented Oct 21, 2022

@mcpowers 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 Oct 21, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 21, 2022

Webrevs

@efge
Copy link

efge commented Oct 22, 2022

Given the repeated code wouldn't you want to create a small helper method like getIDNullSafe?

@XueleiFan
Copy link
Member

There are some other places, for example in updatePkey(), that use cka_id. Did you have a chance to check if NPE is possible there as well?

@ascarpino
Copy link
Contributor

Looking at the usage of getID(), it seems like debug msgs and exceptions are where the null maybe a problem. mapLabel() checks for null. It maybe best to change getID(bytes[]) to return new String("null") then having if() checks for the return value.

@seanjmullan
Copy link
Member

You should add a noreg label (ex: noreg-trivial or noreg-other) to the bug if you don't plan on writing a regression test.

@mcpowers
Copy link
Contributor Author

@efge Good suggestion. And having NullSafe in the name answers an important question.

@XueleiFan Regarding updatePkey, getID is only used for exception messages. I'm going to use getIDNullSafe to prevent an unexpected exception doesn't throw yet another exception.

@ascarpino Agreed.

@seanjmullan noreg-trivial

@openjdk
Copy link

openjdk bot commented Oct 24, 2022

@mcpowers
The label noreg-trivial is not a valid label.
These labels are valid:

  • serviceability
  • hotspot
  • hotspot-compiler
  • ide-support
  • kulla
  • i18n
  • shenandoah
  • jdk
  • javadoc
  • security
  • hotspot-runtime
  • jmx
  • build
  • nio
  • client
  • core-libs
  • compiler
  • net
  • hotspot-gc
  • hotspot-jfr

Copy link
Contributor

@ascarpino ascarpino left a comment

Choose a reason for hiding this comment

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

looks good

@openjdk
Copy link

openjdk bot commented Oct 25, 2022

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

8293093: NPE in P11KeyStore.getID

Reviewed-by: ascarpino, xuelei

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

  • e0c2930: 8295282: Use Zicboz/cbo.zero to zero-out memory on RISC-V
  • d393e05: 8294989: ResourceBundle naming convention issue in JdbcRowSetResourceBundle.java
  • 0caea81: 8295895: build error after JDK-8279366
  • ee0dec8: 8295838: Document why we do not print Code Cache Roots phase in G1 logging
  • ef60608: 8295732: Directly embed TruncatedSeqs in G1Analytics
  • 3e49f8f: 8295839: G1: Single threaded phases (within parallel phases) report as using multiple threads in logs
  • 427f506: 8279366: CDS should allow alternative locations for JAR files in classpath
  • 3a873d3: 8295808: GrowableArray should support capacity management
  • 6289600: 8295810: cleanup debug agent removeThread() api
  • 5c4d99a: 8295118: G1: Clear CLD claim marks concurrently
  • ... and 34 more: https://git.openjdk.org/jdk/compare/f41711ef63d1a14392bf5e5b9ae6939f8772e803...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. Possible candidates are the reviewers of this PR (@ascarpino, @XueleiFan) but any other Committer may sponsor as well.

➡️ 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 the ready Pull request is ready to be integrated label Oct 25, 2022
@mcpowers
Copy link
Contributor Author

Thanks Tony!

@XueleiFan
Copy link
Member

@mcpowers Did you want to update line line 203-207 as well? It might be safe to remove the current getID(byte[]) method. If the parameter is null, there is an NPE (unexpected); otherwise, the new method should be safe to use.

@mcpowers
Copy link
Contributor Author

@XueleiFan Lines 204 and 206 can't be collapsed into a single call to getIDNullSafe because of square brackets in the output on line 204. I don't want to change existing output in any way. Perhaps I'm not understanding your question.

@XueleiFan
Copy link
Member

@XueleiFan Lines 204 and 206 can't be collapsed into a single call to getIDNullSafe because of square brackets in the output on line 204. I don't want to change existing output in any way. Perhaps I'm not understanding your question.

I just feel that it may be not necessary to maintain both getID() and getIDNullSafe(). But no problem if you want to keep the square brackets for toString().

@mcpowers
Copy link
Contributor Author

@XueleiFan Thanks for reviewing this!

@mcpowers
Copy link
Contributor Author

/integrate

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

openjdk bot commented Oct 25, 2022

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

@ascarpino
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 26, 2022

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 26, 2022

@ascarpino @mcpowers Pushed as commit 8e5d680.

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

@mcpowers mcpowers deleted the JDK-8293093 branch October 26, 2022 20:47
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
5 participants