Browse Source

Fix race in blas_thread_shutdown.

blas_server_avail was read without holding server_lock. If multiple threads call blas_thread_shutdown simultaneously, for example, by calling fork(), then they can attempt to shut down multiple times. This can lead to a segmentation fault.
tags/v0.3.14^2
Peter Hawkins 5 years ago
parent
commit
dbbf92c1d1
1 changed files with 19 additions and 18 deletions
  1. +19
    -18
      driver/others/blas_server.c

+ 19
- 18
driver/others/blas_server.c View File

@@ -1024,38 +1024,39 @@ int BLASFUNC(blas_thread_shutdown)(void){


int i; int i;


if (!blas_server_avail) return 0;

LOCK_COMMAND(&server_lock); LOCK_COMMAND(&server_lock);


for (i = 0; i < blas_num_threads - 1; i++) {
if (blas_server_avail) {


for (i = 0; i < blas_num_threads - 1; i++) {


pthread_mutex_lock (&thread_status[i].lock);


atomic_store_queue(&thread_status[i].queue, (blas_queue_t *)-1);
thread_status[i].status = THREAD_STATUS_WAKEUP;
pthread_cond_signal (&thread_status[i].wakeup);
pthread_mutex_lock (&thread_status[i].lock);


pthread_mutex_unlock(&thread_status[i].lock);
atomic_store_queue(&thread_status[i].queue, (blas_queue_t *)-1);
thread_status[i].status = THREAD_STATUS_WAKEUP;
pthread_cond_signal (&thread_status[i].wakeup);


}
pthread_mutex_unlock(&thread_status[i].lock);


for(i = 0; i < blas_num_threads - 1; i++){
pthread_join(blas_threads[i], NULL);
}
}


for(i = 0; i < blas_num_threads - 1; i++){
pthread_mutex_destroy(&thread_status[i].lock);
pthread_cond_destroy (&thread_status[i].wakeup);
}
for(i = 0; i < blas_num_threads - 1; i++){
pthread_join(blas_threads[i], NULL);
}

for(i = 0; i < blas_num_threads - 1; i++){
pthread_mutex_destroy(&thread_status[i].lock);
pthread_cond_destroy (&thread_status[i].wakeup);
}


#ifdef NEED_STACKATTR #ifdef NEED_STACKATTR
pthread_attr_destory(&attr);
pthread_attr_destroy(&attr);
#endif #endif


blas_server_avail = 0;
blas_server_avail = 0;


}
UNLOCK_COMMAND(&server_lock); UNLOCK_COMMAND(&server_lock);


return 0; return 0;


Loading…
Cancel
Save