8251438: Issues with our POSIX set_signal_handler() #1680

gerard-ziemski · 2020-12-07T21:45:57Z

This is a fix for a potential issue involving "The storage occupied by sa_handler and sa_sigaction may overlap, and a conforming application shall not use both simultaneously." https://pubs.opengroup.org/onlinepubs/009695399/functions/sigaction.html, when we in fact do assume different storages.

Progress

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

Issue

JDK-8251438: Issues with our POSIX set_signal_handler()

Reviewers

David Holmes (@dholmes-ora - Reviewer)
Thomas Stuefe (@tstuefe - Reviewer)

Download

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

bridgekeeper · 2020-12-07T21:46:45Z

👋 Welcome back gziemski! 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-12-07T21:47:31Z

@gerard-ziemski The following label will be automatically applied to this pull request:

hotspot-runtime

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 · 2020-12-07T21:55:25Z

Webrevs

01: Full - Incremental (aedc4cd)
00: Full (123acb4)

dholmes-ora

Hi Gerard,
Functionally this is fine. Stylistically I would have just done simply:

return (act.sa_flags & SA_SIGINFO) != 0 ? CAST_FROM_FN_PTR(address, act.sa_sigaction) : CAST_FROM_FN_PTR(address, act.sa_handler);

Thanks,
David

openjdk · 2020-12-10T07:08:50Z

@gerard-ziemski 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:

8251438: Issues with our POSIX set_signal_handler()

Reviewed-by: dholmes, stuefe

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

8bf46c7: 8258438: build error in test/hotspot/gtest/runtime/test_os.cpp
7977e38: 8254024: Enhance native libs for AWT and Swing to work with GraalVM Native Image
c37eabe: 8252148: vmError::controlled_crash should be #ifdef ASSERT and move tests to gtest
2273f95: 8234930: Use MAP_JIT when allocating pages for code cache on macOS
da2415f: 8257457: Update --release 16 symbol information for JDK 16 build 28
36e2097: 8255917: runtime/cds/SharedBaseAddress.java failed "assert(reserved_rgn != 0LL) failed: No reserved region"
d53ee62: 8255899: Allow uninstallation of jpackage exe bundles
65756ab: 8257802: LogCompilation throws couldn't find bytecode on JDK 8 log
a372be4: 8258244: Shenandoah: Not expecting forwarded object in roots during mark after JDK-8240868
568dc29: 8185734: [Windows] Structured Exception Catcher missing around gtest execution
... and 120 more: https://git.openjdk.java.net/jdk/compare/bbc44f57c4714a49e72a09f0b9d05765d6b41e9b...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.

gerard-ziemski · 2020-12-10T20:03:47Z

Hi Gerard,
Functionally this is fine. Stylistically I would have just done simply:

return (act.sa_flags & SA_SIGINFO) != 0 ? CAST_FROM_FN_PTR(address, act.sa_sigaction) : CAST_FROM_FN_PTR(address, act.sa_handler);

Thanks,
David

Thank you David for the review, but I need to pull it out of JDK16 and redo for JDK17. I think I need to withdraw and close it.

gerard-ziemski · 2020-12-10T20:13:58Z

I was told that all I need to do is to wait till official JDK16->JDK17 switch over, and can use this PR for JDK17.

tstuefe

Hi Gerard,

I was confused about the patch. Its fine from a simplification standpoint - putting all those ? expressions into one place - but where were we relying on different storage?

Cheers, Thomas

src/hotspot/os/posix/signals_posix.cpp

mlbridge · 2020-12-11T07:29:58Z

Mailing list message from David Holmes on hotspot-runtime-dev:

Hi Thomas,

On 11/12/2020 5:22 pm, Thomas Stuefe wrote:

On Mon, 7 Dec 2020 21:45:57 GMT, Gerard Ziemski <gziemski at openjdk.org> wrote:

This is a fix for a potential issue involving "The storage occupied by sa_handler and sa_sigaction may overlap, and a conforming application shall not use both simultaneously." https://pubs.opengroup.org/onlinepubs/009695399/functions/sigaction.html, when we in fact do assume different storages.

Hi Gerard,

I was confused about the patch. Its fine from a simplification standpoint - putting all those ? expressions into one place - but where were we relying on different storage?

We were reading both fields from the same structure without checking the
flag value:

void* oldhand = oldAct.sa_sigaction
? CAST_FROM_FN_PTR(void*, oldAct.sa_sigaction)
: CAST_FROM_FN_PTR(void*, oldAct.sa_handler);

Cheers,
David

tstuefe · 2020-12-11T08:35:40Z

Mailing list message from David Holmes on hotspot-runtime-dev:

Hi Thomas,

On 11/12/2020 5:22 pm, Thomas Stuefe wrote:

On Mon, 7 Dec 2020 21:45:57 GMT, Gerard Ziemski wrote:

This is a fix for a potential issue involving "The storage occupied by sa_handler and sa_sigaction may overlap, and a conforming application shall not use both simultaneously." https://pubs.opengroup.org/onlinepubs/009695399/functions/sigaction.html, when we in fact do assume different storages.

Hi Gerard,
I was confused about the patch. Its fine from a simplification standpoint - putting all those ? expressions into one place - but where were we relying on different storage?

We were reading both fields from the same structure without checking the
flag value:

void* oldhand = oldAct.sa_sigaction
? CAST_FROM_FN_PTR(void*, oldAct.sa_sigaction)
: CAST_FROM_FN_PTR(void*, oldAct.sa_handler);

Cheers,
David

Ah, I missed that. Thanks!

tstuefe

Looks good now!

dholmes-ora

Looks good.
Thanks,
David

gerard-ziemski · 2020-12-16T17:09:21Z

/integrate

openjdk · 2020-12-16T17:10:08Z

@gerard-ziemski Since your change was applied there have been 138 commits pushed to the master branch:

6eca296: 8258420: Move URL configuration from Docs.gmk to conf dir
3c66485: 8257906: JFR: RecordingStream leaks memory
0c8cc2c: 8258058: improve description of OutOfMemoryError relevant flags
cdb5342: 8258252: Move PtrQueue enqueue to PtrQueueSet subclasses
17ace83: 8258074: Move some flags related to compiler to compiler_globals.hpp
47ba652: 8258455: problem list tools/jdeprscan/tests/jdk/jdeprscan/TestRelease.java
1e77896: 8236225: Remove expired flags in JDK 17
4d6f318: 8257726: Make -XX:+StressLdcRewrite option a diagnostic option
8bf46c7: 8258438: build error in test/hotspot/gtest/runtime/test_os.cpp
7977e38: 8254024: Enhance native libs for AWT and Swing to work with GraalVM Native Image
... and 128 more: https://git.openjdk.java.net/jdk/compare/bbc44f57c4714a49e72a09f0b9d05765d6b41e9b...master

Your commit was automatically rebased without conflicts.

Pushed as commit 70183f4.

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

gerard-ziemski · 2020-12-16T17:35:16Z

Thank you David and Thomas for the reviews!

gerard-ziemski added 2 commits December 7, 2020 15:35

fix potential sa_handler/sa_sigaction overlap storage issue

2104a8c

update to latest

123acb4

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Dec 7, 2020

gerard-ziemski marked this pull request as ready for review December 7, 2020 21:51

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

dholmes-ora approved these changes Dec 10, 2020

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 10, 2020

gerard-ziemski closed this Dec 10, 2020

gerard-ziemski reopened this Dec 10, 2020

tstuefe suggested changes Dec 11, 2020

View reviewed changes

src/hotspot/os/posix/signals_posix.cpp Outdated Show resolved Hide resolved

change get_signal_handler to take pass by reference attribute

aedc4cd

tstuefe approved these changes Dec 15, 2020

View reviewed changes

dholmes-ora approved these changes Dec 15, 2020

View reviewed changes

openjdk bot closed this Dec 16, 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 16, 2020

gerard-ziemski deleted the JDK-8251438 branch February 17, 2021 18:57

8251438: Issues with our POSIX set_signal_handler() #1680

8251438: Issues with our POSIX set_signal_handler() #1680

gerard-ziemski commented Dec 7, 2020 •

edited by openjdk bot

bridgekeeper bot commented Dec 7, 2020

openjdk bot commented Dec 7, 2020

mlbridge bot commented Dec 7, 2020 •

edited

dholmes-ora left a comment •

edited

openjdk bot commented Dec 10, 2020 •

edited

gerard-ziemski commented Dec 10, 2020

gerard-ziemski commented Dec 10, 2020

tstuefe left a comment

mlbridge bot commented Dec 11, 2020

tstuefe commented Dec 11, 2020

tstuefe left a comment •

edited

dholmes-ora left a comment

gerard-ziemski commented Dec 16, 2020

openjdk bot commented Dec 16, 2020

gerard-ziemski commented Dec 16, 2020

8251438: Issues with our POSIX set_signal_handler() #1680

8251438: Issues with our POSIX set_signal_handler() #1680

Conversation

gerard-ziemski commented Dec 7, 2020 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Dec 7, 2020

openjdk bot commented Dec 7, 2020

mlbridge bot commented Dec 7, 2020 • edited

Webrevs

dholmes-ora left a comment • edited

Choose a reason for hiding this comment

openjdk bot commented Dec 10, 2020 • edited

gerard-ziemski commented Dec 10, 2020

gerard-ziemski commented Dec 10, 2020

tstuefe left a comment

Choose a reason for hiding this comment

mlbridge bot commented Dec 11, 2020

tstuefe commented Dec 11, 2020

tstuefe left a comment • edited

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

gerard-ziemski commented Dec 16, 2020

openjdk bot commented Dec 16, 2020

gerard-ziemski commented Dec 16, 2020

gerard-ziemski commented Dec 7, 2020 •

edited by openjdk bot

mlbridge bot commented Dec 7, 2020 •

edited

dholmes-ora left a comment •

edited

openjdk bot commented Dec 10, 2020 •

edited

tstuefe left a comment •

edited