Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0 #18910

Closed
wants to merge 2 commits into from

Conversation

lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Apr 23, 2024

There is a structure called winsize, that is read on Linux and Mac to get the size of the terminal. This is part of JLine, which we use. This structure has fields of type short. But, our native counterpart (which is not from JLine, because JLine uses JNA to retrieve the values) uses GetIntField/SetIntField to access the data.

This patch fixes that to use GetShortField/SetShortField.


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-8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18910

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 23, 2024

👋 Welcome back jlahoda! 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
Copy link

openjdk bot commented Apr 23, 2024

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

8328703: Illegal accesses in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ioctl0

Reviewed-by: asotona, shade

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

  • fcb4a8b: 8330578: The VM creates instance of abstract class VirtualMachineError
  • 3bd6982: 8326150: Typo in the documentation for jdk.jshell
  • d9d926d: 8330145: Serial: Refactor SerialHeap::scan_evacuated_objs
  • 1a6da3d: 8330822: Remove ModRefBarrierSet::write_ref_array_work
  • 281f9bd: 8330735: RISC-V: No need to move sp to tmp register in set_last_Java_frame
  • daa5a4b: 8330802: Desugar switch in Locale::createLocale
  • 8961077: 8309259: Reduce calls to MethodHandles.lookup() in jdk.internal.net.http.Stream
  • 574ba14: 8330862: GCBarrierIRExample fails when a different GC is selected via the command line
  • 550a138: 8306928: Duplicate variable assignement in jdk.internal.net.http.AuthenticationFilter#getCredentials
  • 57ebd04: 8330153: C2: dump barrier information for all Mach nodes
  • ... and 274 more: https://git.openjdk.org/jdk/compare/7eb78e332080df3890b66ca04338a4ba69af45eb...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 openjdk bot added the rfr Pull request is ready for review label Apr 23, 2024
@openjdk
Copy link

openjdk bot commented Apr 23, 2024

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

  • kulla

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.

@openjdk openjdk bot added the kulla kulla-dev@openjdk.org label Apr 23, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 23, 2024

Webrevs

Copy link
Member

@asotona asotona left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 23, 2024
@lahodaj
Copy link
Contributor Author

lahodaj commented Apr 25, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2024

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

  • ef745a6: 8331097: Tests build is broken after pr/18914
  • d32f109: 8329797: Shenandoah: Default case invoked for: "MaxL" (bad AD file)
  • ccc0d0f: 8325373: Improve StackCounter error reporting for bad switch cases
  • e818ab6: 8330815: Use pattern matching for instanceof in KeepAliveCache
  • d43654e: 8331030: langtools/tools/javac/tree tests fail with SOE with fastdebug and -Xcomp
  • 21480a7: 8322135: Printing JTable in Windows L&F throws InternalError: HTHEME is null
  • e6118ce: 8331018: Clean up non-standard use of /** comments in jdk.jshell
  • a44ac02: 8330853: Add missing checks for ConnectionGraph::can_reduce_cmp() call
  • 8a8d928: 8330611: AES-CTR vector intrinsic may read out of bounds (x86_64, AVX-512)
  • 0014e0e: 8331061: Serial: Missed BOT update in TenuredGeneration::expand_and_allocate
  • ... and 320 more: https://git.openjdk.org/jdk/compare/7eb78e332080df3890b66ca04338a4ba69af45eb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 25, 2024
@openjdk openjdk bot closed this Apr 25, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 25, 2024
@openjdk
Copy link

openjdk bot commented Apr 25, 2024

@lahodaj Pushed as commit 87e864b.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated kulla kulla-dev@openjdk.org
3 participants