8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream #17

apavlyutkin · 2022-03-18T12:24:37Z

Hi!

Please review the backport of JDK-8190753 to 8u. The patch fixes IllegalArgumentException that takes place on accessing large (>2^31 bytes) entries in zipfs.

The original patch

openjdk/jdk11u-dev#545

was applied with the following changes:

changes to absent DeflatingEntryOutputStream class were skipped (in 8u EntryOutputStream handles both RAW and deflating streaming);
the tests were updated to not use unsupported APIs like Path.of() and Map.of()
timeout value for ZipFSOutputStreamTest was increased because the test is too greedy and may fail by timeout on low performance hosts

The changes were previously reviewed: https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-December/014479.html

Verification/regression: jdk_other (20.04/amd64)

Progress

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

Issue

JDK-8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream

Reviewers

Paul Hohensee (@phohensee - Reviewer) ⚠️ Review applies to 4ea7265
Andrew John Hughes (@gnu-andrew - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk8u-dev pull/17/head:pull/17
$ git checkout pull/17

Update a local copy of the PR:
$ git checkout pull/17
$ git pull https://git.openjdk.java.net/jdk8u-dev pull/17/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk8u-dev/pull/17.diff

…egative initial size for ByteArrayOutputStream Backport-of: 8a9cda2d84513ab49a54e1d2a7b530f0bae05c61

bridgekeeper · 2022-03-18T12:25:19Z

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

mlbridge · 2022-03-18T12:31:04Z

Webrevs

openjdk · 2022-03-18T12:33:40Z

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

phohensee

Lgtm.

openjdk · 2022-03-18T16:48:28Z

@apavlyutkin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream

Reviewed-by: phh, andrew

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

b249159: 8261107: ArrayIndexOutOfBoundsException in the ICC_Profile.getInstance(InputStream)
10029f7: 8253424: Add support for running pre-submit testing using GitHub Actions
62bbb3e: 8281814: Debuginfo.diz contains redundant build path after backport JDK-8025936
c5ca29f: 8255239: The timezone of the hs_err_pid log file is corrupted in Japanese locale
e403fd5: 8274751: Drag And Drop hangs on Windows
f8a6695: 8274658: ISO 4217 Amendment 170 Update
57d8d29: 8132256: jaxp: Investigate removal of com/sun/org/apache/bcel/internal/util/ClassPath.java
bb69732: 8129572: Cleanup usage of getResourceAsStream in jaxp
969f31e: Merge
0183285: Added tag jdk8u332-b05 for changeset 2a92df021686
... and 5 more: https://git.openjdk.java.net/jdk8u-dev/compare/b5bcf6c272cdd0397555bcf0d9887081016bc9a4...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 (@phohensee, @gnu-andrew) 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).

gnu-andrew · 2022-04-05T00:45:35Z

Sorry for the delay on sorting this one out. It seems to have been bounced across all three repositories during the Git transition.

It now looks correct to me from a technical perspective. However, I am seeing some very odd whitespace differences between the two new test files when compared with the versions in 11u (either from the patch or the 11u-dev repository) e.g

-  @AfterMethod
+    @AfterMethod
     public void tearDown() throws IOException {
-    deleteFiles();
-  }
+        deleteFiles();
+    }

I don't know how this has occurred - I don't recall it being present in the original review - but I think the simplest way to fix it would be to store a diff between your 8u versions and the 11u versions using -b, replace the 8u ones with the ones from 11u, and then reapply your changes for 8u from the diff i.e. something like

$ diff -ub ../jdk11u-dev/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java jdk/test/demo/zipfs/ZipFSOutputStreamTest.java  > /tmp/test1.patch
$ cp ../jdk11u-dev/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java jdk/test/demo/zipfs
$ <edit test1.patch to remove any remaining unneeded whitespace changes>
$ patch -Np0 < /tmp/test1.patch

apavlyutkin · 2022-04-05T08:44:45Z

Sorry for the delay on sorting this one out. It seems to have been bounced across all three repositories during the Git transition.

It now looks correct to me from a technical perspective. However, I am seeing some very odd whitespace differences between the two new test files when compared with the versions in 11u (either from the patch or the 11u-dev repository) e.g
-  @AfterMethod
+    @AfterMethod
     public void tearDown() throws IOException {
-    deleteFiles();
-  }
+        deleteFiles();
+    }
I don't know how this has occurred - I don't recall it being present in the original review - but I think the simplest way to fix it would be to store a diff between your 8u versions and the 11u versions using -b, replace the 8u ones with the ones from 11u, and then reapply your changes for 8u from the diff i.e. something like
$ diff -ub ../jdk11u-dev/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java jdk/test/demo/zipfs/ZipFSOutputStreamTest.java  > /tmp/test1.patch
$ cp ../jdk11u-dev/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java jdk/test/demo/zipfs
$ <edit test1.patch to remove any remaining unneeded whitespace changes>
$ patch -Np0 < /tmp/test1.patch

fixed

gnu-andrew

This version looks a lot better. There do still seem to be a few odd differences that have crept in, when compared to the patch in 11u, which I've noted in my review. These should be quick to fix, then we can get this in.

jdk/test/demo/zipfs/LargeCompressedEntrySizeTest.java

jdk/test/demo/zipfs/ZipFSOutputStreamTest.java

gnu-andrew

Brilliant, let's finally get this in.

gnu-andrew · 2022-04-08T02:14:45Z

I've added jdk8u-fix-yes to the bug.

apavlyutkin · 2022-04-08T06:53:36Z

/integrate

openjdk · 2022-04-08T06:55:27Z

@apavlyutkin
Your change (at version 8911a60) is now ready to be sponsored by a Committer.

yan-too · 2022-04-08T06:57:03Z

/sponsor

openjdk · 2022-04-08T06:57:47Z

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

b249159: 8261107: ArrayIndexOutOfBoundsException in the ICC_Profile.getInstance(InputStream)
10029f7: 8253424: Add support for running pre-submit testing using GitHub Actions
62bbb3e: 8281814: Debuginfo.diz contains redundant build path after backport JDK-8025936
c5ca29f: 8255239: The timezone of the hs_err_pid log file is corrupted in Japanese locale
e403fd5: 8274751: Drag And Drop hangs on Windows
f8a6695: 8274658: ISO 4217 Amendment 170 Update
57d8d29: 8132256: jaxp: Investigate removal of com/sun/org/apache/bcel/internal/util/ClassPath.java
bb69732: 8129572: Cleanup usage of getResourceAsStream in jaxp
969f31e: Merge
0183285: Added tag jdk8u332-b05 for changeset 2a92df021686
... and 5 more: https://git.openjdk.java.net/jdk8u-dev/compare/b5bcf6c272cdd0397555bcf0d9887081016bc9a4...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-04-08T06:58:05Z

@yan-too @apavlyutkin Pushed as commit 3647d98.

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

8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a n…

4ea7265

…egative initial size for ByteArrayOutputStream Backport-of: 8a9cda2d84513ab49a54e1d2a7b530f0bae05c61

openjdk bot changed the title ~~8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a n…~~ 8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream Mar 18, 2022

openjdk bot added the rfr Pull request is ready for review label Mar 18, 2022

apavlyutkin changed the title ~~8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream~~ Backport 8a9cda2d84513ab49a54e1d2a7b530f0bae05c61 Mar 18, 2022

openjdk bot changed the title ~~Backport 8a9cda2d84513ab49a54e1d2a7b530f0bae05c61~~ 8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream Mar 18, 2022

openjdk bot added the backport label Mar 18, 2022

phohensee approved these changes Mar 18, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 18, 2022

Alexey Pavlyutkin added 2 commits April 5, 2022 11:40

fixing whitespace difference

b80f70e

fixing whitespace difference

f09b849

gnu-andrew reviewed Apr 7, 2022

View reviewed changes

Alexey Pavlyutkin added 3 commits April 7, 2022 08:10

eliminating unwanted delta with 11u

bd43dc5

eliminating unwanted delta with 11u

7263cc0

eliminating unwanted delta with 11u

8911a60

gnu-andrew approved these changes Apr 8, 2022

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 8, 2022

openjdk bot added the integrated Pull request has been integrated label Apr 8, 2022

openjdk bot closed this Apr 8, 2022

openjdk bot removed the ready Pull request is ready to be integrated label Apr 8, 2022

openjdk bot removed rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Apr 8, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream #17

8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream #17

apavlyutkin commented Mar 18, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Mar 18, 2022

mlbridge bot commented Mar 18, 2022 •

edited

Loading

openjdk bot commented Mar 18, 2022

phohensee left a comment

openjdk bot commented Mar 18, 2022 •

edited

Loading

gnu-andrew commented Apr 5, 2022 •

edited

Loading

apavlyutkin commented Apr 5, 2022

gnu-andrew left a comment

gnu-andrew left a comment

gnu-andrew commented Apr 8, 2022

apavlyutkin commented Apr 8, 2022

openjdk bot commented Apr 8, 2022

yan-too commented Apr 8, 2022

openjdk bot commented Apr 8, 2022

openjdk bot commented Apr 8, 2022

8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream #17

8190753: (zipfs): Accessing a large entry (> 2^31 bytes) leads to a negative initial size for ByteArrayOutputStream #17

Conversation

apavlyutkin commented Mar 18, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Mar 18, 2022

mlbridge bot commented Mar 18, 2022 • edited Loading

Webrevs

openjdk bot commented Mar 18, 2022

phohensee left a comment

Choose a reason for hiding this comment

openjdk bot commented Mar 18, 2022 • edited Loading

gnu-andrew commented Apr 5, 2022 • edited Loading

apavlyutkin commented Apr 5, 2022

gnu-andrew left a comment

Choose a reason for hiding this comment

gnu-andrew left a comment

Choose a reason for hiding this comment

gnu-andrew commented Apr 8, 2022

apavlyutkin commented Apr 8, 2022

openjdk bot commented Apr 8, 2022

yan-too commented Apr 8, 2022

openjdk bot commented Apr 8, 2022

openjdk bot commented Apr 8, 2022

apavlyutkin commented Mar 18, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Mar 18, 2022 •

edited

Loading

openjdk bot commented Mar 18, 2022 •

edited

Loading

gnu-andrew commented Apr 5, 2022 •

edited

Loading