public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: Re: [PATCH] Cygwin: shared: Fix access permissions setting in open_shared().
Date: Wed, 16 Aug 2023 09:07:41 +0900	[thread overview]
Message-ID: <20230816090741.3d78d7b6278be4e438ca0ff3@nifty.ne.jp> (raw)
In-Reply-To: <20230815233746.1424-1-takashi.yano@nifty.ne.jp>

On Wed, 16 Aug 2023 08:37:46 +0900
Takashi Yano wrote:
> After the commit 93508e5bb841, the access permissions argument passed
> to open_shared() is ignored and always replaced with (FILE_MAP_READ |
> FILE_MAP_WRITE). This causes the weird behaviour that sshd service
> process loses its cygwin PID. This triggers the failure in pty that
> transfer_input() does not work properly.
> 
> This patch resumes the access permission settings to fix that.
> 
> Fixes: 93508e5bb841 ("Cygwin: open_shared: don't reuse shared_locations parameter as output")
> Signedd-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
> ---
>  winsup/cygwin/mm/shared.cc | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/winsup/cygwin/mm/shared.cc b/winsup/cygwin/mm/shared.cc
> index 40cdd4722..7977df382 100644
> --- a/winsup/cygwin/mm/shared.cc
> +++ b/winsup/cygwin/mm/shared.cc
> @@ -139,8 +139,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
>        if (name)
>  	mapname = shared_name (map_buf, name, n);
>        if (m == SH_JUSTOPEN)
> -	shared_h = OpenFileMappingW (FILE_MAP_READ | FILE_MAP_WRITE, FALSE,
> -				     mapname);
> +	shared_h = OpenFileMappingW (access, FALSE, mapname);
>        else
>  	{
>  	  created = true;
> @@ -165,8 +164,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
>    do
>      {
>        addr = (void *) next_address;
> -      shared = MapViewOfFileEx (shared_h, FILE_MAP_READ | FILE_MAP_WRITE,
> -				0, 0, 0, addr);
> +      shared = MapViewOfFileEx (shared_h, access, 0, 0, 0, addr);
>        next_address += wincap.allocation_granularity ();
>        if (next_address >= SHARED_REGIONS_ADDRESS_HIGH)
>  	{
> -- 
> 2.39.0
> 

cygwin-3_4-branch needs to modify the patch a bit.

diff --git a/winsup/cygwin/mm/shared.cc b/winsup/cygwin/mm/shared.cc
index 2ea3a4336..20b57ff4d 100644
--- a/winsup/cygwin/mm/shared.cc
+++ b/winsup/cygwin/mm/shared.cc
@@ -148,8 +148,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
       if (name)
 	mapname = shared_name (map_buf, name, n);
       if (m == SH_JUSTOPEN)
-	shared_h = OpenFileMappingW (FILE_MAP_READ | FILE_MAP_WRITE, FALSE,
-				     mapname);
+	shared_h = OpenFileMappingW (access, FALSE, mapname);
       else
 	{
 	  created = true;
@@ -175,8 +174,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
 	 Note that we don't actually *need* fixed addresses.  The only
 	 advantage is reproducibility to help /proc/<PID>/maps along. */
       addr = (void *) region_address[m];
-      shared = MapViewOfFileEx (shared_h, FILE_MAP_READ | FILE_MAP_WRITE,
-				0, 0, 0, addr);
+      shared = MapViewOfFileEx (shared_h, access, 0, 0, 0, addr);
     }
   /* Also catch the unlikely case that a fixed region can't be mapped at the
      fixed address. */
@@ -190,8 +188,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
       do
 	{
 	  addr = (void *) next_address;
-	  shared = MapViewOfFileEx (shared_h, FILE_MAP_READ | FILE_MAP_WRITE,
-				    0, 0, 0, addr);
+	  shared = MapViewOfFileEx (shared_h, access, 0, 0, 0, addr);
 	  next_address += wincap.allocation_granularity ();
 	  if (next_address >= SHARED_REGIONS_ADDRESS_HIGH)
 	    {



-- 
Takashi Yano <takashi.yano@nifty.ne.jp>

  reply	other threads:[~2023-08-16  0:07 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-15 23:37 Takashi Yano
2023-08-16  0:07 ` Takashi Yano [this message]
2023-08-16  7:51 ` Corinna Vinschen
2023-08-16  7:54   ` Corinna Vinschen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230816090741.3d78d7b6278be4e438ca0ff3@nifty.ne.jp \
    --to=takashi.yano@nifty.ne.jp \
    --cc=cygwin-patches@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).