8255542: Attribute length of Module, ModulePackages and other attributes is ignored #1407

AlanBateman · 2020-11-24T10:58:43Z

The attribute_length of known ModuleXXXX attributes in the module-info.class is currently ignored. It should be checked and the class rejected if the attribute length doesn't exactly match the length of the info in the attribute.

There are several ways to fix this. I initially limited the reading of the attribute_info to the attribute length but this resulted in confusing exception messages as the attribute appears truncated. The exception messages are clearer when it checks that the attribute length corresponds to the number of bytes read.

Progress

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

Issue

JDK-8255542: Attribute length of Module, ModulePackages and other attributes is ignored

Reviewers

Mandy Chung (@mlchung - Reviewer)
Daniel Fuchs (@dfuch - Reviewer)
Chris Hegarty (@ChrisHegarty - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1407/head:pull/1407
$ git checkout pull/1407

bridgekeeper · 2020-11-24T10:59:25Z

👋 Welcome back alanb! 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 · 2020-11-24T11:01:10Z

@AlanBateman The following label will be automatically applied to this pull request:

core-libs

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.

mlchung

Looks okay.

openjdk · 2020-11-24T21:17:34Z

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

8255542: Attribute length of Module, ModulePackages and other attributes is ignored

Reviewed-by: mchung, dfuchs, chegar

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

6c9482e: 8257561: Some code is not vectorized after 8251925 and 8250607
70517c8: 8257642: CipherByteBufferOverwriteTest copyright issue
e836396: 8257436: [aarch64] Regressions in ArrayCopyUnalignedDst.testByte/testChar for 65-78 bytes when UseSIMDForMemoryOps is on
b170c83: 8257591: Remove suppression of record preview related warnings in java.lang
66a2e70: 8255845: Memory leak in imageFile.cpp
fa58671: 8257020: [JVMCI] enable a JVMCICompiler to specify which GCs it supports
129c377: 8257594: C2 compiled checkcast of non-null object triggers endless deoptimization/recompilation cycle
e4497c9: 8256718: Obsolete the long term deprecated and aliased Trace flags
4a267f1: 8244847: Linux/PPC: runtime/CompressedOops/CompressedClassPointers: smallHeapTest fails
b44a329: 8256864: [windows] Improve tracing for mapping errors

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

mlbridge · 2020-12-02T18:32:00Z

Webrevs

01: Full - Incremental (f15dbb1)
00: Full (600db8c)

dfuch · 2020-12-02T18:45:52Z

src/java.base/share/classes/jdk/internal/module/ModuleInfo.java


+            long newPosition = in.count();
+            if (newPosition != (initialPosition + length)) {


should this be:

if ((newPosition - intialPosition) != length) {

just to make it clear that no overflow can happen?

The attribute_length is a u4 so shouldn't arise but you are probably right that it would be clearer to reorganize it as you suggest.

src/java.base/share/classes/jdk/internal/module/ModuleInfo.java

forax · 2020-12-03T12:50:56Z

src/java.base/share/classes/jdk/internal/module/ModuleInfo.java

+
+        @Override
+        public String readUTF() throws IOException {
+            return DataInputStream.readUTF(this);


If i understand correctly the code, I believe readUTF should change a boolean field named countCanNotBeTrackedAnymore from false to true, and in the method count(), countCanNotBeTrackedAnymore has to be checked and throws an ISE before returning count

Hi Rémi, I do not think that that is required. DataInputStream.readUTF will call back into this to do the reading so the count should be properly incremented? Or maybe I'm missing something. Best regards!

Thanks,
i should have read the code more carefully.

The module-info is read sequentially so the constant pool is read (and indexed) before the attributes are read. So any references to UTF-8 constants doesn't involve random access. But maybe you mean something else?

AlanBateman · 2020-12-04T08:58:40Z

/integrate

openjdk · 2020-12-04T08:59:43Z

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

ca40267: 8257509: Strengthen requirements to call G1HeapVerifier::verify(VerifyOption)
4a85514: 8257182: JCK test failures in integer / long rotation tests
f33808f: 8257631: C2: Assertion failure in ArrayCopyNode::get_count() during late inlining
417e7e6: 8257632: C2: Late inlining attempt on a call with a dead memory crashes
6845fee: 8257625: C2: Harden input checks in vector intrinsics
4390f2c: 8257630: C2: ReplacedNodes doesn't handle non-CFG multi nodes
d08c612: 8257708: Remove redundant unmodifiableSet wrapper from already immutable set returned by Collections.singleton
49f9e57: 8257734: Extraneous output in HmacSHA3_512 constructor
f83fd4a: 8257438: Avoid adding duplicate values into extendedKeyCodesSet
37c7835: 8257673: Build fails without shenandoahgc after JDK-8257563
... and 20 more: https://git.openjdk.java.net/jdk/compare/ae1eb286c6a2e76c3b38d68641208d4c01d4eef8...master

Your commit was automatically rebased without conflicts.

Pushed as commit 2b4a423.

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

AlanBateman added 6 commits October 26, 2020 11:21

Reject classes with attribute length that doesn't match actual

99d27f0

Merge

46083da

Add test

6506fee

Test cleanup

d07979b

Merge

1515125

Expand test to Module attribute

a9d731c

openjdk bot added the core-libs core-libs-dev@openjdk.org label Nov 24, 2020

Trailing whitespace

09c5564

mlchung approved these changes Nov 24, 2020

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 24, 2020

AlanBateman added 2 commits December 1, 2020 13:00

Merge

9e76782

Merge

600db8c

AlanBateman marked this pull request as ready for review December 2, 2020 18:28

openjdk bot added the rfr Pull request is ready for review label Dec 2, 2020

dfuch reviewed Dec 2, 2020

View reviewed changes

AlanBateman added 2 commits December 3, 2020 08:11

Merge

8f6fcd8

Restructure check to make it more obvious that it doesn't overflow

f15dbb1

dfuch approved these changes Dec 3, 2020

View reviewed changes

src/java.base/share/classes/jdk/internal/module/ModuleInfo.java Show resolved Hide resolved

ChrisHegarty approved these changes Dec 3, 2020

View reviewed changes

forax reviewed Dec 3, 2020

View reviewed changes

mlchung approved these changes Dec 3, 2020

View reviewed changes

openjdk bot closed this Dec 4, 2020

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 Dec 4, 2020

8255542: Attribute length of Module, ModulePackages and other attributes is ignored #1407

8255542: Attribute length of Module, ModulePackages and other attributes is ignored #1407

AlanBateman commented Nov 24, 2020 •

edited by openjdk bot

bridgekeeper bot commented Nov 24, 2020

openjdk bot commented Nov 24, 2020

mlchung left a comment

openjdk bot commented Nov 24, 2020 •

edited

mlbridge bot commented Dec 2, 2020 •

edited

dfuch Dec 2, 2020

AlanBateman Dec 2, 2020

forax Dec 3, 2020

dfuch Dec 3, 2020

forax Dec 3, 2020

AlanBateman Dec 3, 2020

AlanBateman commented Dec 4, 2020

openjdk bot commented Dec 4, 2020


		long newPosition = in.count();
		if (newPosition != (initialPosition + length)) {

8255542: Attribute length of Module, ModulePackages and other attributes is ignored #1407

8255542: Attribute length of Module, ModulePackages and other attributes is ignored #1407

Conversation

AlanBateman commented Nov 24, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Nov 24, 2020

openjdk bot commented Nov 24, 2020

mlchung left a comment

Choose a reason for hiding this comment

openjdk bot commented Nov 24, 2020 • edited

mlbridge bot commented Dec 2, 2020 • edited

Webrevs

dfuch Dec 2, 2020

Choose a reason for hiding this comment

AlanBateman Dec 2, 2020

Choose a reason for hiding this comment

forax Dec 3, 2020

Choose a reason for hiding this comment

dfuch Dec 3, 2020

Choose a reason for hiding this comment

forax Dec 3, 2020

Choose a reason for hiding this comment

AlanBateman Dec 3, 2020

Choose a reason for hiding this comment

AlanBateman commented Dec 4, 2020

openjdk bot commented Dec 4, 2020

AlanBateman commented Nov 24, 2020 •

edited by openjdk bot

openjdk bot commented Nov 24, 2020 •

edited

mlbridge bot commented Dec 2, 2020 •

edited