forked from git-for-windows/MSYS2-packages
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
msys2-runtime: restore blocking mode of read pipe on close()
The Cygwin runtime (and for that reason, the MSYS2 runtime, too), change pipes from blocking to non-blocking, which is a problem when the pipe is actually opened by something like Git when it asks a credential helper for information. Git, not expecting the pipe mode to be changed behind its back, will then error out with "fatal: read error: Invalid argument". To address this, this patch was proposed in the Cygwin project as https://inbox.sourceware.org/cygwin-patches/20240830141553.12128-1-takashi.yano@nifty.ne.jp/ Ideally, Cygwin would not even _try_ to fiddle with the pipe mode, therefore this patch was not applied as-is. At time of writing, there is no consensus on any replacement patch, but I have to prepare _something_ for the already-late Git for Windows v2.46.1 (which is likely the last Git for Windows version to support Windows 7 and Windows 8, hence the urgency). And this patch at least improves the situation. This patch will be dropped when Git for Windows will upgrade to MSYS2 runtime v3.5, and hopefully consensus will have been reached about a better fix by that time. This commit corresponds to git-for-windows/msys2-runtime#72 which fixes git-for-windows/git#5115. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
- Loading branch information
Showing
3 changed files
with
84 additions
and
6 deletions.
There are no files selected for viewing
75 changes: 75 additions & 0 deletions
75
msys2-runtime/0083-Cygwin-pipe-Restore-blocking-mode-of-read-pipe-on-cl.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| From acc71340a481ff3ebe339b015f58ae7505fec585 Mon Sep 17 00:00:00 2001 | ||
| From: Takashi Yano <takashi.yano@nifty.ne.jp> | ||
| Date: Fri, 30 Aug 2024 23:15:44 +0900 | ||
| Subject: [PATCH 83/N] Cygwin: pipe: Restore blocking mode of read pipe on | ||
| close() | ||
|
|
||
| If a cygwin app is executed from a non-cygwin app and the cygwin | ||
| app exits, read pipe remains on non-blocking mode because of the | ||
| commit fc691d0246b9. Due to this behaviour, the non-cygwin app | ||
| cannot read the pipe correctly after that. With this patch, the | ||
| blocking mode of the read pipe is stored into was_blocking_read_pipe | ||
| on set_pipe_non_blocking() when the cygwin app starts and restored | ||
| on close(). | ||
|
|
||
| Addresses: https://github.com/git-for-windows/git/issues/5115 | ||
| Fixes: fc691d0246b9 ("Cygwin: pipe: Make sure to set read pipe non-blocking for cygwin apps."); | ||
| Reported-by: isaacag, Johannes Schindelin <Johannes.Schindelin@gmx.de> | ||
| Reported-at: https://github.com/git-for-windows/git/issues/5115 | ||
| Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp> | ||
| Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> | ||
| --- | ||
| winsup/cygwin/fhandler/pipe.cc | 13 +++++++++++++ | ||
| winsup/cygwin/local_includes/fhandler.h | 1 + | ||
| 2 files changed, 14 insertions(+) | ||
|
|
||
| diff --git a/winsup/cygwin/fhandler/pipe.cc b/winsup/cygwin/fhandler/pipe.cc | ||
| index 8daae8d..c47226b 100644 | ||
| --- a/winsup/cygwin/fhandler/pipe.cc | ||
| +++ b/winsup/cygwin/fhandler/pipe.cc | ||
| @@ -54,6 +54,15 @@ fhandler_pipe::set_pipe_non_blocking (bool nonblocking) | ||
| IO_STATUS_BLOCK io; | ||
| FILE_PIPE_INFORMATION fpi; | ||
|
|
||
| + if (get_device () == FH_PIPER && nonblocking && !was_blocking_read_pipe) | ||
| + { | ||
| + status = NtQueryInformationFile (get_handle (), &io, &fpi, sizeof fpi, | ||
| + FilePipeInformation); | ||
| + if (NT_SUCCESS (status)) | ||
| + was_blocking_read_pipe = | ||
| + (fpi.CompletionMode == FILE_PIPE_QUEUE_OPERATION); | ||
| + } | ||
| + | ||
| fpi.ReadMode = FILE_PIPE_BYTE_STREAM_MODE; | ||
| fpi.CompletionMode = nonblocking ? FILE_PIPE_COMPLETE_OPERATION | ||
| : FILE_PIPE_QUEUE_OPERATION; | ||
| @@ -94,6 +103,8 @@ fhandler_pipe::init (HANDLE f, DWORD a, mode_t mode, int64_t uniq_id) | ||
| even with FILE_SYNCHRONOUS_IO_NONALERT. */ | ||
| set_pipe_non_blocking (get_device () == FH_PIPER ? | ||
| true : is_nonblocking ()); | ||
| + was_blocking_read_pipe = false; | ||
| + | ||
| return 1; | ||
| } | ||
|
|
||
| @@ -675,6 +686,8 @@ fhandler_pipe::close () | ||
| CloseHandle (query_hdl); | ||
| if (query_hdl_close_req_evt) | ||
| CloseHandle (query_hdl_close_req_evt); | ||
| + if (was_blocking_read_pipe) | ||
| + set_pipe_non_blocking (false); | ||
| int ret = fhandler_base::close (); | ||
| ReleaseMutex (hdl_cnt_mtx); | ||
| CloseHandle (hdl_cnt_mtx); | ||
| diff --git a/winsup/cygwin/local_includes/fhandler.h b/winsup/cygwin/local_includes/fhandler.h | ||
| index 15b19f7..f017a6d 100644 | ||
| --- a/winsup/cygwin/local_includes/fhandler.h | ||
| +++ b/winsup/cygwin/local_includes/fhandler.h | ||
| @@ -1193,6 +1193,7 @@ private: | ||
| uint64_t pipename_key; | ||
| DWORD pipename_pid; | ||
| LONG pipename_id; | ||
| + bool was_blocking_read_pipe; | ||
| void release_select_sem (const char *); | ||
| HANDLE get_query_hdl_per_process (WCHAR *, OBJECT_NAME_INFORMATION *); | ||
| HANDLE get_query_hdl_per_system (WCHAR *, OBJECT_NAME_INFORMATION *); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2e2ef940151485490aff0c7b00c00965ef7a71a4 | ||
| bc1f6498ab09182349c5d5daa2d81626990a2832 |