8358289: [asan] runtime/cds/appcds/aotCode/AOTCodeFlags.java reports heap-buffer-overflow in ArchiveBuilder

[vnkozlov]

There is difference between AdapterFingerPrint allocation size compute_size which may not be aligned to HeapWord size and size used for copying during AOT cache build which is aligned and can be bigger than allocation size.

I added asserts to AdapterFingerPrint and AdapterHandlerEntry to make sure sizes are correct. Both are used in AOT cache build.

I also moved FreeHeap() from ~AdapterFingerPrint() to enforce the comment and simplify executed code.

Thanks to @MBaesken for finding the issue and @iklam for pointing the cause.

Testing tier1-3, xcomp, stress. Higher tiers are still running.

---

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-8358289: [asan] runtime/cds/appcds/aotCode/AOTCodeFlags.java reports heap-buffer-overflow in ArchiveBuilder (Bug - P3)

Reviewers

• Ashutosh Mehra (@ashu-mehra - Committer) Review applies to 9b67ceab
• Aleksey Shipilev (@shipilev - Reviewer)
• Ioi Lam (@iklam - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25604

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back kvn! 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]

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

8358289: [asan] runtime/cds/appcds/aotCode/AOTCodeFlags.java reports heap-buffer-overflow in ArchiveBuilder

Reviewed-by: shade, iklam, asmehra

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

• 9c74d54: 8358158: test/jdk/java/io/Console/CharsetTest.java failing with NoClassDefFoundError: jtreg/SkippedException
• 9397535: 8356803: Test TextLayout/TestControls fails on windows & linux: line and paragraph separator show non-zero advance
• da49fa5: 8354460: Streaming output for attach API should be turned on by default
• ... and 45 more: https://git.openjdk.org/jdk/compare/ab5de45636f0bf96e52c0ae0dcf080f279d9caee...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]

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

• hotspot

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]

Webrevs

• 02: Full - Incremental (862e7826)
• 01: Full - Incremental (9b67ceab)
• 00: Full (b03c5070)

[vnkozlov]

@MBaesken please test this.

[ashu-mehra]

@iklam @MBaesken Nice catch.
@vnkozlov thanks for fixing it.

I realized compute_size() does not use sig_bt parameter. Since you are touching this code, can you please remove it as well.

[shipilev]

Looks okay. Asserts get a bit tautological, but it is pleasantly paranoid for my taste.

[vnkozlov]

Thank you, Aleksey

[vnkozlov]

Waiting confirmation from @MBaesken .

[vnkozlov]

Thank you, @iklam

[vnkozlov]

/integrate

[openjdk]

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

• 939521b: 8358105: RISC-V: Optimize interpreter profile updates
• 2345065: 8357600: Patch nmethod flushing message to include more details
• 9c74d54: 8358158: test/jdk/java/io/Console/CharsetTest.java failing with NoClassDefFoundError: jtreg/SkippedException
• ... and 47 more: https://git.openjdk.org/jdk/compare/ab5de45636f0bf96e52c0ae0dcf080f279d9caee...master

Your commit was automatically rebased without conflicts.

[openjdk]

@vnkozlov Pushed as commit ebd8528.

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

[MBaesken]

Waiting confirmation from @MBaesken .

The issue is fixed now!