From fd67a9cf7b733da082e4b6a5f25c19ea7921b4cd Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 4 May 2016 15:14:29 +0200 Subject: [PATCH] aio: fix newp->running data race * sysdeps/pthread/aio_misc.c (__aio_enqueue_request): Do not write `running` field of `newp` when a thread was started to process it, since that thread will not take `__aio_requests_mutex`, and the field already has the proper value actually. --- ChangeLog | 7 +++++++ sysdeps/pthread/aio_misc.c | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45e8375e5f..575c17f7a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-05-04 Samuel Thibault + + * sysdeps/pthread/aio_misc.c (__aio_enqueue_request): Do not write + `running` field of `newp` when a thread was started to process it, + since that thread will not take `__aio_requests_mutex`, and the field + already has the proper value actually. + 2016-05-04 Florian Weimer [BZ #19787] diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c index f55570d23b..faf139d901 100644 --- a/sysdeps/pthread/aio_misc.c +++ b/sysdeps/pthread/aio_misc.c @@ -453,7 +453,11 @@ __aio_enqueue_request (aiocb_union *aiocbp, int operation) result = 0; } } + else + newp->running = running; } + else + newp->running = running; /* Enqueue the request in the run queue if it is not yet running. */ if (running == yes && result == 0) @@ -466,9 +470,7 @@ __aio_enqueue_request (aiocb_union *aiocbp, int operation) pthread_cond_signal (&__aio_new_request_notification); } - if (result == 0) - newp->running = running; - else + if (result != 0) { /* Something went wrong. */ __aio_free_request (newp);