[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#25178: 26.0.50; Crash when pressing C-g in TTY mode
From: |
Eli Zaretskii |
Subject: |
bug#25178: 26.0.50; Crash when pressing C-g in TTY mode |
Date: |
Sat, 17 Dec 2016 15:58:58 +0200 |
> From: Elias Martenson <elias.martenson@murex.com>
> CC: <25178@debbugs.gnu.org>
> Date: Wed, 14 Dec 2016 11:09:12 +0800
>
> Calling pthread_mutex_unlock() twice has to be undefined behaviour. In
> fact, it can never work. Imagine what would happen if a different thread
> called pthread_mutex_lock() on the mutex between two the two unlock
> calls. In that case, you'd be unlocking a mutex help by a different
> thread which is obviously very dangerous.
Can you try the patch below and see if it stops the crashes? With
this patch, I no longer see two calls to pthread_mutex_unlock in a
row.
Would people who know about signals and threads please eyeball this
patch and comment on whether it is correct, safe, etc.? TIA.
diff --git a/src/keyboard.c b/src/keyboard.c
index 1fb1d49..f2ee313 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2571,6 +2571,9 @@ read_char (int commandflag, Lisp_Object map,
so restore it now. */
restore_getcjmp (save_jump);
pthread_sigmask (SIG_SETMASK, &empty_mask, 0);
+#if THREADS_ENABLED
+ maybe_reacquire_global_lock ();
+#endif
unbind_to (jmpcount, Qnil);
XSETINT (c, quit_char);
internal_last_event_frame = selected_frame;
diff --git a/src/sysdep.c b/src/sysdep.c
index 3d2b9bd..5e5a605 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -765,6 +765,23 @@ unblock_child_signal (sigset_t const *oldset)
pthread_sigmask (SIG_SETMASK, oldset, 0);
}
+void
+block_interrupt_signal (sigset_t *oldset)
+{
+ sigset_t blocked;
+ sigemptyset (&blocked);
+ sigaddset (&blocked, SIGINT);
+ pthread_sigmask (SIG_BLOCK, &blocked, oldset);
+}
+
+/* Unblock SIGINT. */
+
+void
+unblock_interrupt_signal (sigset_t const *oldset)
+{
+ pthread_sigmask (SIG_SETMASK, oldset, 0);
+}
+
#endif /* !MSDOS */
/* Saving and restoring the process group of Emacs's terminal. */
diff --git a/src/syssignal.h b/src/syssignal.h
index 3de83c7..d3b585c 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -25,6 +25,8 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
extern void init_signals (bool);
extern void block_child_signal (sigset_t *);
extern void unblock_child_signal (sigset_t const *);
+extern void block_interrupt_signal (sigset_t *);
+extern void unblock_interrupt_signal (sigset_t const *);
extern void block_tty_out_signal (sigset_t *);
extern void unblock_tty_out_signal (sigset_t const *);
diff --git a/src/thread.c b/src/thread.c
index e8cb430..e519558 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -24,6 +24,7 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#include "buffer.h"
#include "process.h"
#include "coding.h"
+#include "syssignal.h"
static struct thread_state primary_thread;
@@ -100,6 +101,23 @@ acquire_global_lock (struct thread_state *self)
post_acquire_global_lock (self);
}
+/* This is called from keyboard.c when it detects that SIGINT
+ interrupted thread_select before the current thread could acquire
+ the lock. We must acquire the lock to prevent a thread from
+ running without holding the global lock, and to avoid repeated
+ calls to sys_mutex_unlock, which invokes undefined behavior. */
+void
+maybe_reacquire_global_lock (void)
+{
+ if (current_thread->not_holding_lock)
+ {
+ struct thread_state *self = current_thread;
+
+ acquire_global_lock (self);
+ current_thread->not_holding_lock = 0;
+ }
+}
+
static void
@@ -493,11 +511,20 @@ really_call_select (void *arg)
{
struct select_args *sa = arg;
struct thread_state *self = current_thread;
+ sigset_t oldset;
+ block_interrupt_signal (&oldset);
+ self->not_holding_lock = 1;
release_global_lock ();
+ unblock_interrupt_signal (&oldset);
+
sa->result = (sa->func) (sa->max_fds, sa->rfds, sa->wfds, sa->efds,
sa->timeout, sa->sigmask);
+
+ block_interrupt_signal (&oldset);
acquire_global_lock (self);
+ self->not_holding_lock = 0;
+ unblock_interrupt_signal (&oldset);
}
int
diff --git a/src/thread.h b/src/thread.h
index 739069a..b044383 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -171,6 +171,13 @@ struct thread_state
interrupter should broadcast to this condition. */
sys_cond_t *wait_condvar;
+ /* This thread might have released the global lock. If so, this is
+ non-zero. When a thread runs outside thread_select with this
+ flag non-zero, it means it has been interrupted by SIGINT while
+ in thread_select, and didn't have a chance of acquiring the lock.
+ It must do so ASAP. */
+ int not_holding_lock;
+
/* Threads are kept on a linked list. */
struct thread_state *next_thread;
};
@@ -224,6 +231,7 @@ extern void unmark_threads (void);
extern void finalize_one_thread (struct thread_state *state);
extern void finalize_one_mutex (struct Lisp_Mutex *);
extern void finalize_one_condvar (struct Lisp_CondVar *);
+extern void maybe_reacquire_global_lock (void);
extern void init_threads_once (void);
extern void init_threads (void);
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, (continued)
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Elias Martenson, 2016/12/12
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Elias Martenson, 2016/12/12
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Eli Zaretskii, 2016/12/13
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Andreas Schwab, 2016/12/13
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Eli Zaretskii, 2016/12/13
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Andreas Schwab, 2016/12/13
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Elias Martenson, 2016/12/13
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Elias Martenson, 2016/12/13
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Eli Zaretskii, 2016/12/13
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Elias Martenson, 2016/12/14
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode,
Eli Zaretskii <=
- bug#25178: 26.0.50; Crash when pressing C-g in TTY mode, Elias Martenson, 2016/12/18
bug#25178: (no subject), eliz, 2016/12/19