Fixed undefined behavior on signals.

The C11 specification allows only sig_atomic_t and _Atomic variable
access. All other accesses to global variables are undefined behavior.

Using int was probably OK on x86 and x86_64; yet there were some reports
from other architectures (especially some MIPS) that in rare cases,
after issuing SIGHUP, BIRD did strange things.

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index c9fee3ab371d6a1368c2c1839b72150682214d30..5e4d95734deb91ed1ad34722a12e01949b59219e 100644 (file)
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2154,10 +2154,6 @@ watchdog_stop(void)
  *     Main I/O Loop
  */
 
-volatile int async_config_flag;                /* Asynchronous reconfiguration/dump scheduled */
-volatile int async_dump_flag;
-volatile int async_shutdown_flag;
-
 void
 io_init(void)
 {

diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index db848033771e1c4ecb39874cc6fec0acb34c2cc6..a52ae3caf8bd0f5b2b139cd0330d4a79081ed557 100644 (file)
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -601,9 +601,9 @@ cmd_graceful_restart(void)
  *     Signals
  */
 
-volatile int async_config_flag;
-volatile int async_dump_flag;
-volatile int async_shutdown_flag;
+volatile sig_atomic_t async_config_flag;
+volatile sig_atomic_t async_dump_flag;
+volatile sig_atomic_t async_shutdown_flag;
 
 static void
 handle_sighup(int sig UNUSED)

diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index bf0aedeba08218791c20537aac39965b55cee7c6..bd817bf2e0849999b100ce4c1a6e9cd6e52dd4bd 100644 (file)
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -10,6 +10,7 @@
 #define _BIRD_UNIX_H_
 
 #include <sys/socket.h>
+#include <signal.h>
 
 struct pool;
 struct iface;
@@ -97,9 +98,9 @@ int sockaddr_read(sockaddr *sa, int af, ip_addr *a, struct iface **ifa, uint *po
 #define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen ((ptr)->sun_path))
 #endif
 
-extern volatile int async_config_flag;
-extern volatile int async_dump_flag;
-extern volatile int async_shutdown_flag;
+extern volatile sig_atomic_t async_config_flag;
+extern volatile sig_atomic_t async_dump_flag;
+extern volatile sig_atomic_t async_shutdown_flag;
 
 void io_init(void);
 void io_loop(void);

diff --git a/test/birdtest.c b/test/birdtest.c
index c0d4bd05f2591352f073c851bb49a26723650753..484205d239030ebe6b590af44e8c93028d77de06 100644 (file)
--- a/test/birdtest.c
+++ b/test/birdtest.c
@@ -36,6 +36,11 @@ static int no_fork;
 static int no_timeout;
 static int is_terminal;                /* Whether stdout is a live terminal or pipe redirect */
 
+volatile sig_atomic_t async_config_flag;               /* Asynchronous reconfiguration/dump scheduled */
+volatile sig_atomic_t async_dump_flag;
+volatile sig_atomic_t async_shutdown_flag;
+
+
 uint bt_verbose;
 const char *bt_filename;
 const char *bt_test_id;