mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '1119-tsan-bin/rndc/rndc.c' into 'master'

Browse Source 
Protect globally accessed variables in rndc.c by making them atomic

See merge request isc-projects/bind9!2370
This commit is contained in:
Ondřej Surý 2019-09-25 08:05:10 -04:00
commit 9b5969eab0
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bin/rndc/rndc.c
View File

@ -16,6 +16,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <isc/app.h> #include <isc/app.h>
#include <isc/atomic.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/commandline.h> #include <isc/commandline.h>
#include <isc/file.h> #include <isc/file.h>
@ -24,6 +25,7 @@
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/print.h> #include <isc/print.h>
#include <isc/random.h> #include <isc/random.h>
#include <isc/refcount.h>
#include <isc/socket.h> #include <isc/socket.h>
#include <isc/stdtime.h> #include <isc/stdtime.h>
#include <isc/string.h> #include <isc/string.h>
@ -73,7 +75,7 @@ static isccc_region_t secret;
static bool failed = false; static bool failed = false;
static bool c_flag = false; static bool c_flag = false;
static isc_mem_t *rndc_mctx; static isc_mem_t *rndc_mctx;
static int sends, recvs, connects; static isc_refcount_t sends, recvs, connects;
static char *command; static char *command;
static char *args; static char *args;
static char program[256]; static char program[256];
@ -271,11 +273,13 @@ rndc_senddone(isc_task_t *task, isc_event_t *event) {
UNUSED(task); UNUSED(task);
sends--; if (sevent->result != ISC_R_SUCCESS) {
if (sevent->result != ISC_R_SUCCESS)
fatal("send failed: %s", isc_result_totext(sevent->result)); fatal("send failed: %s", isc_result_totext(sevent->result));
}
isc_event_free(&event); isc_event_free(&event);
if (sends == 0 && recvs == 0) { if (isc_refcount_decrement(&sends) == 1 &&
isc_refcount_current(&recvs) == 0)
{
isc_socket_detach(&sock); isc_socket_detach(&sock);
isc_task_shutdown(task); isc_task_shutdown(task);
isc_app_shutdown(); isc_app_shutdown();
@ -291,7 +295,7 @@ rndc_recvdone(isc_task_t *task, isc_event_t *event) {
char *textmsg = NULL; char *textmsg = NULL;
isc_result_t result; isc_result_t result;
recvs--; isc_refcount_decrement(&recvs);
if (ccmsg.result == ISC_R_EOF) if (ccmsg.result == ISC_R_EOF)
fatal("connection to remote host closed\n" fatal("connection to remote host closed\n"
@ -344,7 +348,8 @@ rndc_recvdone(isc_task_t *task, isc_event_t *event) {
isc_event_free(&event); isc_event_free(&event);
isccc_sexpr_free(&response); isccc_sexpr_free(&response);
if (sends == 0 && recvs == 0) { if (isc_refcount_current(&sends) == 0
&& isc_refcount_current(&recvs) == 0) {
isc_socket_detach(&sock); isc_socket_detach(&sock);
isc_task_shutdown(task); isc_task_shutdown(task);
isc_app_shutdown(); isc_app_shutdown();
@ -364,7 +369,7 @@ rndc_recvnonce(isc_task_t *task, isc_event_t *event) {
isccc_sexpr_t *data; isccc_sexpr_t *data;
isc_buffer_t b; isc_buffer_t b;
recvs--; isc_refcount_decrement(&recvs);
if (ccmsg.result == ISC_R_EOF) if (ccmsg.result == ISC_R_EOF)
fatal("connection to remote host closed\n" fatal("connection to remote host closed\n"
@ -425,10 +430,10 @@ rndc_recvnonce(isc_task_t *task, isc_event_t *event) {
isccc_ccmsg_cancelread(&ccmsg); isccc_ccmsg_cancelread(&ccmsg);
DO("schedule recv", isccc_ccmsg_readmessage(&ccmsg, task, DO("schedule recv", isccc_ccmsg_readmessage(&ccmsg, task,
rndc_recvdone, NULL)); rndc_recvdone, NULL));
recvs++; isc_refcount_increment(&recvs);
DO("send message", isc_socket_send(sock, &r, task, rndc_senddone, DO("send message", isc_socket_send(sock, &r, task, rndc_senddone,
NULL)); NULL));
sends++; isc_refcount_increment(&sends);
isc_event_free(&event); isc_event_free(&event);
isccc_sexpr_free(&response); isccc_sexpr_free(&response);
@ -447,7 +452,7 @@ rndc_connected(isc_task_t *task, isc_event_t *event) {
isc_buffer_t b; isc_buffer_t b;
isc_result_t result; isc_result_t result;
connects--; isc_refcount_decrement(&connects);
if (sevent->result != ISC_R_SUCCESS) { if (sevent->result != ISC_R_SUCCESS) {
isc_sockaddr_format(&serveraddrs[currentaddr], socktext, isc_sockaddr_format(&serveraddrs[currentaddr], socktext,
@ -493,10 +498,10 @@ rndc_connected(isc_task_t *task, isc_event_t *event) {
DO("schedule recv", isccc_ccmsg_readmessage(&ccmsg, task, DO("schedule recv", isccc_ccmsg_readmessage(&ccmsg, task,
rndc_recvnonce, NULL)); rndc_recvnonce, NULL));
recvs++; isc_refcount_increment(&recvs);
DO("send message", isc_socket_send(sock, &r, task, rndc_senddone, DO("send message", isc_socket_send(sock, &r, task, rndc_senddone,
NULL)); NULL));
sends++; isc_refcount_increment(&sends);
isc_event_free(&event); isc_event_free(&event);
isccc_sexpr_free(&request); isccc_sexpr_free(&request);
} }
@ -531,7 +536,7 @@ rndc_startconnect(isc_sockaddr_t *addr, isc_task_t *task) {
} }
DO("connect", isc_socket_connect(sock, addr, task, rndc_connected, DO("connect", isc_socket_connect(sock, addr, task, rndc_connected,
NULL)); NULL));
connects++; isc_refcount_increment(&connects);
} }
static void static void
@ -995,8 +1000,12 @@ main(int argc, char **argv) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
fatal("isc_app_run() failed: %s", isc_result_totext(result)); fatal("isc_app_run() failed: %s", isc_result_totext(result));
if (connects > 0 || sends > 0 || recvs > 0) if (isc_refcount_current(&connects) > 0 ||
isc_refcount_current(&sends) > 0 ||
isc_refcount_current(&recvs) > 0)
{
isc_socket_cancel(sock, task, ISC_SOCKCANCEL_ALL); isc_socket_cancel(sock, task, ISC_SOCKCANCEL_ALL);
}
isc_task_detach(&task); isc_task_detach(&task);
isc_taskmgr_destroy(&taskmgr); isc_taskmgr_destroy(&taskmgr);