From: Paul Eggert <eggert@cs.ucla.edu>
To: Filipp Gunbin <fgunbin@fastmail.fm>
Cc: Alan Third <alan@idiocy.org>, 33154@debbugs.gnu.org
Subject: bug#33154: 27.0.50; create_process on Darwin should not invoke setsid() after vfork() [PATCH]
Date: Tue, 6 Nov 2018 23:41:46 -0800 [thread overview]
Message-ID: <fc9123bf-e9fb-fa89-73a5-a79db13372f9@cs.ucla.edu> (raw)
In-Reply-To: <m2sh0dhe95.fsf@fastmail.fm>
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
Filipp Gunbin wrote:
> In your patch, we don't detach from current (Emacs's) controlling
> terminal before doing TIOCSCTTY.
Ah, OK. I see also that vfork won't work on Darwin if pty mode is used, since
Emacs wants to create a new session and Darwin setsid always fails in a vforked
child that has not yet execed.
However, your patch introduces another duplicate of the open/TIOCNOTTY/close
fallback code, making three duplicates in all. How about if we coalesce these
duplicates into a function and then call that function? Also, I think we can
call the function from just two places (not three). Furthermore, I think it'd be
more robust if Emacs does setsid everywhere (with a fallback to
open/TIOCNOTTY/close everywhere TIOCNOTTY is available), not just Darwin.
Proposed patch (against master) attached.
[-- Attachment #2: 0001-Dissociate-controlling-tty-better-on-Darwin.patch --]
[-- Type: text/x-patch, Size: 3706 bytes --]
From cff3581f79d5eeb251fb683250bf48da3f68895a Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 6 Nov 2018 23:30:26 -0800
Subject: [PATCH] Dissociate controlling tty better on Darwin
* src/process.c (dissociate_controlling_tty): New function.
(create_process): Use it to dissociate controlling tty if setsid
fails, which happens on Darwin after a vfork (Bug#33154).
Do this on all platforms, not just on Darwin, as a similar
problem is plausible elsewhere.
* src/callproc.c (call_process): Use the new function here, too,
for consistency and to avoid duplicate code.
---
src/callproc.c | 14 +-------------
src/process.c | 40 ++++++++++++++++++++++------------------
src/process.h | 1 +
3 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/src/callproc.c b/src/callproc.c
index a2cfd2e94d..9f47c79b81 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -643,19 +643,7 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
#endif
unblock_child_signal (&oldset);
-
-#ifdef DARWIN_OS
- /* Darwin doesn't let us run setsid after a vfork, so use
- TIOCNOTTY when necessary. */
- int j = emacs_open (DEV_TTY, O_RDWR, 0);
- if (j >= 0)
- {
- ioctl (j, TIOCNOTTY, 0);
- emacs_close (j);
- }
-#else
- setsid ();
-#endif
+ dissociate_controlling_tty ();
/* Emacs ignores SIGPIPE, but the child should not. */
signal (SIGPIPE, SIG_DFL);
diff --git a/src/process.c b/src/process.c
index 6cda4f27ac..7e78e172d3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1949,6 +1949,26 @@ close_process_fd (int *fd_addr)
}
}
+void
+dissociate_controlling_tty (void)
+{
+ if (setsid () < 0)
+ {
+#ifdef TIOCNOTTY
+ /* Needed on Darwin after vfork, since setsid fails in a vforked
+ child that has not execed.
+ I wonder: would just ioctl (fd, TIOCNOTTY, 0) work here, for
+ some fd that the caller already has? */
+ int ttyfd = emacs_open (DEV_TTY, O_RDWR, 0);
+ if (0 <= ttyfd)
+ {
+ ioctl (ttyfd, TIOCNOTTY, 0);
+ emacs_close (ttyfd);
+ }
+#endif
+ }
+}
+
/* Indexes of file descriptors in open_fds. */
enum
{
@@ -2097,9 +2117,8 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
{
/* Make the pty be the controlling terminal of the process. */
#ifdef HAVE_PTYS
- /* First, disconnect its current controlling terminal.
- Do this even if !PTY_FLAG; see Bug#30762. */
- setsid ();
+ dissociate_controlling_tty ();
+
/* Make the pty's terminal the controlling terminal. */
if (pty_flag && forkin >= 0)
{
@@ -2128,21 +2147,6 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
}
#endif
#endif
-#ifdef TIOCNOTTY
- /* In 4.3BSD, the TIOCSPGRP bug has been fixed, and now you
- can do TIOCSPGRP only to the process's controlling tty. */
- if (pty_flag)
- {
- /* I wonder: would just ioctl (0, TIOCNOTTY, 0) work here?
- I can't test it since I don't have 4.3. */
- int j = emacs_open (DEV_TTY, O_RDWR, 0);
- if (j >= 0)
- {
- ioctl (j, TIOCNOTTY, 0);
- emacs_close (j);
- }
- }
-#endif /* TIOCNOTTY */
#if !defined (DONT_REOPEN_PTY)
/*** There is a suggestion that this ought to be a
diff --git a/src/process.h b/src/process.h
index 3c6dd7b91f..67b783400d 100644
--- a/src/process.h
+++ b/src/process.h
@@ -300,6 +300,7 @@ extern Lisp_Object network_interface_info (Lisp_Object);
extern Lisp_Object remove_slash_colon (Lisp_Object);
extern void update_processes_for_thread_death (Lisp_Object);
+extern void dissociate_controlling_tty (void);
INLINE_HEADER_END
--
2.17.1
next prev parent reply other threads:[~2018-11-07 7:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-25 19:30 bug#33154: 27.0.50; create_process on Darwin should not invoke setsid() after vfork() [PATCH] Filipp Gunbin
2018-10-26 11:12 ` Alan Third
2018-11-07 1:35 ` Filipp Gunbin
2018-11-05 17:28 ` Paul Eggert
2018-11-06 13:46 ` Filipp Gunbin
2018-11-07 1:23 ` Filipp Gunbin
2018-11-07 7:41 ` Paul Eggert [this message]
2018-11-07 8:53 ` Filipp Gunbin
2018-11-07 15:40 ` Paul Eggert
2018-11-09 0:07 ` Alan Third
2018-11-09 10:29 ` Filipp Gunbin
2018-11-09 11:16 ` Andreas Schwab
2018-11-10 15:24 ` Filipp Gunbin
2018-11-10 17:09 ` Paul Eggert
2018-11-11 17:14 ` Filipp Gunbin
2018-11-10 17:05 ` Paul Eggert
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fc9123bf-e9fb-fa89-73a5-a79db13372f9@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=33154@debbugs.gnu.org \
--cc=alan@idiocy.org \
--cc=fgunbin@fastmail.fm \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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).