mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-22 10:10:06 +00:00
815c47f800
Locally, clang reported odr-violation:
=================================================================
==588371==ERROR: AddressSanitizer: odr-violation (0x55555556a060):
[1] size=256 'client_addrs' ../tests/ns/netmgr_wrap.c:36:18 in /home/ondrej/Projects/bind9/build/tests/ns/query
[2] size=256 'client_addrs' ../tests/ns/netmgr_wrap.c:36:18 in /home/ondrej/Projects/bind9/build/tests/ns/../libbindtest.so
These globals were registered at these points:
[1]:
#0 0x7ffff785306f in __asan_register_globals ../../../../src/libsanitizer/asan/asan_globals.cpp:350
#1 0x7ffff6a2a303 in call_init ../csu/libc-start.c:145
#2 0x7ffff6a2a303 in __libc_start_main_impl ../csu/libc-start.c:347
#3 0x55555555a084 in _start (/home/ondrej/Projects/bind9/build/tests/ns/query+0x6084) (BuildId: fbe4a3fcf1a249c7d7da69ee8b255a1dbb610c7a)
[2]:
#0 0x7ffff785306f in __asan_register_globals ../../../../src/libsanitizer/asan/asan_globals.cpp:350
#1 0x7ffff7fca71e in call_init elf/dl-init.c:74
#2 0x7ffff7fca823 in call_init elf/dl-init.c:120
#3 0x7ffff7fca823 in _dl_init elf/dl-init.c:121
#4 0x7ffff7fe459f (/lib64/ld-linux-x86-64.so.2+0x1f59f) (BuildId: 281ac1521b4102509b1c7ac7004db7c1efb81796)
==588371==HINT: if you don't care about these errors you may set ASAN_OPTIONS=detect_odr_violation=0
SUMMARY: AddressSanitizer: odr-violation: global 'client_addrs' at ../tests/ns/netmgr_wrap.c:36:18 in /home/ondrej/Projects/bind9/build/tests/ns/query
==588371==ABORTING
Move the client_addrs and client_refs to libtest to prevent this.
118 lines
2.6 KiB
C
118 lines
2.6 KiB
C
/*
|
|
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
*
|
|
* SPDX-License-Identifier: MPL-2.0
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
|
*
|
|
* See the COPYRIGHT file distributed with this work for additional
|
|
* information regarding copyright ownership.
|
|
*/
|
|
|
|
/*! \file */
|
|
|
|
#include <isc/atomic.h>
|
|
#include <isc/netmgr.h>
|
|
#include <isc/util.h>
|
|
|
|
#include <dns/view.h>
|
|
|
|
#include <ns/client.h>
|
|
|
|
#include <tests/ns.h>
|
|
|
|
#if ISC_NETMGR_TRACE
|
|
#define FLARG \
|
|
, const char *func ISC_ATTR_UNUSED, const char *file ISC_ATTR_UNUSED, \
|
|
unsigned int line ISC_ATTR_UNUSED
|
|
#else
|
|
#define FLARG
|
|
#endif
|
|
|
|
/*
|
|
* We don't want to use netmgr-based client accounting, we need to emulate it.
|
|
*/
|
|
|
|
#if ISC_NETMGR_TRACE
|
|
void
|
|
isc_nmhandle__attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp FLARG) {
|
|
#else
|
|
void
|
|
isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
|
|
#endif
|
|
ns_client_t *client = (ns_client_t *)source;
|
|
int i;
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
if (atomic_load(&client_addrs[i]) == (uintptr_t)client) {
|
|
break;
|
|
}
|
|
}
|
|
INSIST(i < 32);
|
|
INSIST(atomic_load(&client_refs[i]) > 0);
|
|
|
|
atomic_fetch_add(&client_refs[i], 1);
|
|
#if 0
|
|
fprintf(stderr, "%s:%s:%s:%d -> %ld\n", __func__, func, file, line,
|
|
client_refs[i]);
|
|
#endif
|
|
|
|
*targetp = source;
|
|
return;
|
|
}
|
|
|
|
#if ISC_NETMGR_TRACE
|
|
void
|
|
isc_nmhandle__detach(isc_nmhandle_t **handlep FLARG) {
|
|
#else
|
|
void
|
|
isc_nmhandle_detach(isc_nmhandle_t **handlep) {
|
|
#endif
|
|
isc_nmhandle_t *handle = *handlep;
|
|
ns_client_t *client = (ns_client_t *)handle;
|
|
int i;
|
|
|
|
*handlep = NULL;
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
if (atomic_load(&client_addrs[i]) == (uintptr_t)client) {
|
|
break;
|
|
}
|
|
}
|
|
INSIST(i < 32);
|
|
|
|
if (atomic_fetch_sub(&client_refs[i], 1) == 1) {
|
|
dns_view_detach(&client->inner.view);
|
|
client->inner.state = 4;
|
|
ns__client_reset_cb(client);
|
|
ns__client_put_cb(client);
|
|
atomic_store(&client_addrs[i], (uintptr_t)NULL);
|
|
}
|
|
#if 0
|
|
fprintf(stderr, "%s:%s:%s:%d -> %ld\n", __func__, func, file, line,
|
|
client_refs[i]);
|
|
#endif
|
|
|
|
return;
|
|
}
|
|
|
|
isc_nmsocket_type
|
|
isc_nm_socket_type(const isc_nmhandle_t *handle ISC_ATTR_UNUSED) {
|
|
/*
|
|
* By arbitrary choice, we treat mock handles as if
|
|
* they were always for UDP sockets. If it's necessary
|
|
* to test with other socket types in the future, this
|
|
* could be changed to a global variable rather than a
|
|
* constant.
|
|
*/
|
|
return isc_nm_udpsocket;
|
|
}
|
|
|
|
void
|
|
ns_client_error(ns_client_t *client ISC_ATTR_UNUSED,
|
|
isc_result_t result ISC_ATTR_UNUSED) {
|
|
return;
|
|
}
|