upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 06:29:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '1377-threadsanitizer-data-race-astack-c-64-in-isc_astack_pop' into 'master'

Browse source 
Fix missing lock around pos and destroy mutex in isc_astack_destroy

Closes #1377

See merge request isc-projects/bind9!2588
This commit is contained in:
Ondřej Surý 2019-11-19 10:03:09 +00:00
commit 304c1b6439
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/isc/astack.c
View file

@ -33,10 +33,10 @@ isc_astack_new(isc_mem_t *mctx, size_t size) {
isc_mem_get(mctx,
sizeof(isc_astack_t) + size * sizeof(uintptr_t));
stack->mctx = NULL;
*stack = (isc_astack_t){
.size = size,
};
isc_mem_attach(mctx, &stack->mctx);
stack->size = size;
stack->pos = 0;
memset(stack->nodes, 0, size * sizeof(uintptr_t));
isc_mutex_init(&stack->lock);
return (stack);
@ -46,11 +46,11 @@ bool
isc_astack_trypush(isc_astack_t *stack, void *obj) {
if (isc_mutex_trylock(&stack->lock) == false) {
if (stack->pos >= stack->size) {
isc_mutex_unlock(&stack->lock);
UNLOCK(&stack->lock);
return (false);
}
stack->nodes[stack->pos++] = (uintptr_t) obj;
isc_mutex_unlock(&stack->lock);
UNLOCK(&stack->lock);
return (true);
} else {
return (false);
@ -59,20 +59,24 @@ isc_astack_trypush(isc_astack_t *stack, void *obj) {
void *
isc_astack_pop(isc_astack_t *stack) {
isc_mutex_lock(&stack->lock);
LOCK(&stack->lock);
uintptr_t rv;
if (stack->pos == 0) {
rv = 0;
} else {
rv = stack->nodes[--stack->pos];
}
isc_mutex_unlock(&stack->lock);
UNLOCK(&stack->lock);
return ((void*) rv);
}
void
isc_astack_destroy(isc_astack_t *stack) {
LOCK(&stack->lock);
REQUIRE(stack->pos == 0);
UNLOCK(&stack->lock);
isc_mutex_destroy(&stack->lock);
isc_mem_putanddetach(&stack->mctx, stack,
sizeof(struct isc_astack) +