8328864: NullPointerException in sun.security.jca.ProviderList.getService() #18746

blperez01 · 2024-04-11T16:29:00Z

Updated getService to check whether getProvider returns null when checking for preferred providers and continue the loop if that is the case. Added NullPreferredList test.

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-8328864: NullPointerException in sun.security.jca.ProviderList.getService() (Bug - P4)

Reviewers

Weijun Wang (@wangweij - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18746

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

Using diff file

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

Webrev

Link to Webrev Comment

…rning null

bridgekeeper · 2024-04-11T16:29:39Z

👋 Welcome back blperez01! 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 · 2024-04-11T16:30:36Z

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

8328864: NullPointerException in sun.security.jca.ProviderList.getService()

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

6f98d8f: 8329692: Add more details to FrameStateTest.java test instructions
6969a9e: 8328999: Update GIFlib to 5.2.2
7a41a52: 8331549: Inline MemAllocator::mem_allocate_slow
3383ad6: 8331253: 16 bits is not enough for nmethod::_skipped_instructions_size field
8771015: 8331027: JDK's ct.sym file packs corrupted module-info classes
553d45b: 8323724: Remove potential re-inflation from FastHashCode under LM_LIGHTWEIGHT
dd0b641: 8330813: Don't call methods from Compressed(Oops|Klass) if the associated mode is inactive
389f6fe: 8331344: No compiler replay file with CompilerCommand MemLimit
a024eed: 8331478: JFR: Rename printHelp methods for jdk.jfr.internal.dcmd classes
9912abf: 8331011: [XWayland] TokenStorage fails under Security Manager
... and 197 more: https://git.openjdk.org/jdk/compare/064628471b83616b4463baa78618d1b7a66d0c7c...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 (@wangweij) 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 · 2024-04-11T16:31:00Z

@blperez01 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.

mlbridge · 2024-04-11T16:33:54Z

Webrevs

01: Full - Incremental (7c5d682b)
00: Full (8ae0a7c3)

wangweij · 2024-04-17T13:31:42Z

test/jdk/sun/security/jca/app-security.properties

@@ -0,0 +1 @@
+jdk.security.provider.preferred=KeyStore.PKCS12:JipherJCE


How about just NonExistingProvider? The JipherJCE name does not make it clear what you intend it to do.

wangweij · 2024-04-17T13:35:16Z

src/java.base/share/classes/sun/security/jca/ProviderList.java

@@ -373,13 +373,15 @@ public Service getService(String type, String name) {
                (pList = preferredPropList.getAll(type, name)) != null) {
            for (i = 0; i < pList.size(); i++) {
                Provider p = getProvider(pList.get(i).provider);
+                if (p == null) {
+                    continue;
+                }


Not related to this cod change, but the getAll line on line 373 will never return null.

wangweij · 2024-04-17T13:35:41Z

test/jdk/sun/security/jca/NullPreferredList.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.


New test, remove 2014, .

wangweij

The change looks good, just some tiny comments. Also, please add newlines to the end of the 2 new files.

blperez01 · 2024-05-02T17:54:50Z

/integrate

openjdk · 2024-05-02T17:56:18Z

@blperez01
Your change (at version 7c5d682) is now ready to be sponsored by a Committer.

wangweij · 2024-05-02T18:49:36Z

/sponsor

openjdk · 2024-05-02T18:50:41Z

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

73cdc9a: 8326421: Add jtreg test for large arrayCopy disjoint case.
e2c0cfe: 8331320: ClassFile API OutOfMemoryError with certain class files
6f98d8f: 8329692: Add more details to FrameStateTest.java test instructions
6969a9e: 8328999: Update GIFlib to 5.2.2
7a41a52: 8331549: Inline MemAllocator::mem_allocate_slow
3383ad6: 8331253: 16 bits is not enough for nmethod::_skipped_instructions_size field
8771015: 8331027: JDK's ct.sym file packs corrupted module-info classes
553d45b: 8323724: Remove potential re-inflation from FastHashCode under LM_LIGHTWEIGHT
dd0b641: 8330813: Don't call methods from Compressed(Oops|Klass) if the associated mode is inactive
389f6fe: 8331344: No compiler replay file with CompilerCommand MemLimit
... and 199 more: https://git.openjdk.org/jdk/compare/064628471b83616b4463baa78618d1b7a66d0c7c...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-05-02T18:50:48Z

@wangweij @blperez01 Pushed as commit cd3a607.

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

blperez01 added 2 commits April 2, 2024 11:52

added test file

346d274

Fixed and renamed test, getService now continues loop instead of retu…

8ae0a7c

…rning null

openjdk bot added the rfr Pull request is ready for review label Apr 11, 2024

openjdk bot added the security security-dev@openjdk.org label Apr 11, 2024

wangweij reviewed Apr 17, 2024

View reviewed changes

blperez01 added 2 commits April 17, 2024 15:11

Fixed copyright, removed unnecessary null check in ProviderList

41cf4e7

Merge branch 'openjdk:master' into JDK-8328864

7c5d682

wangweij approved these changes Apr 17, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 17, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label May 2, 2024

openjdk bot added the integrated Pull request has been integrated label May 2, 2024

openjdk bot closed this May 2, 2024

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 May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8328864: NullPointerException in sun.security.jca.ProviderList.getService() #18746

8328864: NullPointerException in sun.security.jca.ProviderList.getService() #18746

blperez01 commented Apr 11, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Apr 11, 2024

openjdk bot commented Apr 11, 2024 •

edited

Loading

openjdk bot commented Apr 11, 2024

mlbridge bot commented Apr 11, 2024 •

edited

Loading

wangweij Apr 17, 2024

wangweij Apr 17, 2024

wangweij Apr 17, 2024

wangweij left a comment

blperez01 commented May 2, 2024

openjdk bot commented May 2, 2024

wangweij commented May 2, 2024

openjdk bot commented May 2, 2024

openjdk bot commented May 2, 2024

		@@ -0,0 +1 @@
		jdk.security.provider.preferred=KeyStore.PKCS12:JipherJCE

		@@ -0,0 +1,41 @@
		/*
		* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.

8328864: NullPointerException in sun.security.jca.ProviderList.getService() #18746

8328864: NullPointerException in sun.security.jca.ProviderList.getService() #18746

Conversation

blperez01 commented Apr 11, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Apr 11, 2024

openjdk bot commented Apr 11, 2024 • edited Loading

openjdk bot commented Apr 11, 2024

mlbridge bot commented Apr 11, 2024 • edited Loading

Webrevs

wangweij Apr 17, 2024

Choose a reason for hiding this comment

wangweij Apr 17, 2024

Choose a reason for hiding this comment

wangweij Apr 17, 2024

Choose a reason for hiding this comment

wangweij left a comment

Choose a reason for hiding this comment

blperez01 commented May 2, 2024

openjdk bot commented May 2, 2024

wangweij commented May 2, 2024

openjdk bot commented May 2, 2024

openjdk bot commented May 2, 2024

blperez01 commented Apr 11, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Apr 11, 2024 •

edited

Loading

mlbridge bot commented Apr 11, 2024 •

edited

Loading