DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uloop: Fix race condition in SIGCHLD handling

Browse source 
When uloop_process_add() is called outside of uloop_run(), i.e. not
from a callback (which is the case of at least utrace and ujail),
child events can be missed. The reason is that when SIGCHILD handler
is installed in uloop_run(), after the uloop_process_add() is called,
then an initial signal could be missed.

Commit 4e3a47a ("uloop: use a waker for notifying sigchld and loop
cancel events", 2016-06-09) solved a similar problem and introduced
uloop_init() but forgot to move a call to uloop_setup_signals() there.
This is what this commit does.

Now, uloop_process_add() can be called any time after uloop_init()
without missing any event.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
Acked-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Michal Sojka 2017-09-12 13:12:31 +02:00 committed by Yousong Zhou
parent fd57eea9f3
commit 7a1057604e
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
uloop.c
View file

@ -116,6 +116,8 @@ static int waker_init(void)
return 0; return 0;
} }
static void uloop_setup_signals(bool add);
int uloop_init(void) int uloop_init(void)
{ {
if (uloop_init_pollfd() < 0) if (uloop_init_pollfd() < 0)
@ -126,6 +128,8 @@ int uloop_init(void)
return -1; return -1;
} }
uloop_setup_signals(true);
return 0; return 0;
} }
@ -525,12 +529,7 @@ int uloop_run_timeout(int timeout)
int next_time = 0; int next_time = 0;
struct timeval tv; struct timeval tv;
/* uloop_run_depth++;
* Handlers are only updated for the first call to uloop_run() (and restored
* when this call is done).
*/
if (!uloop_run_depth++)
uloop_setup_signals(true);
uloop_status = 0; uloop_status = 0;
uloop_cancelled = false; uloop_cancelled = false;
@ -553,14 +552,15 @@ int uloop_run_timeout(int timeout)
uloop_run_events(next_time); uloop_run_events(next_time);
} }
if (!--uloop_run_depth) --uloop_run_depth;
uloop_setup_signals(false);
return uloop_status; return uloop_status;
} }
void uloop_done(void) void uloop_done(void)
{ {
uloop_setup_signals(false);
if (poll_fd >= 0) { if (poll_fd >= 0) {
close(poll_fd); close(poll_fd);
poll_fd = -1; poll_fd = -1;