luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hostip: add locks around use of global buffer for alarm()

Browse Source 
When building with the sync name resolver and timeout ability we now
require thread-safety to be present to enable it.

Closes #11030
This commit is contained in:
Harry Sintonen 2023-04-25 09:22:26 +02:00 committed by Daniel Stenberg
parent 91b53efa4b
commit 13718030ad
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/hostip.c
View File

@ -70,12 +70,19 @@
#include <SystemConfiguration/SCDynamicStoreCopySpecific.h> #include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
#endif #endif
#if defined(CURLRES_SYNCH) && \ #if defined(CURLRES_SYNCH) && \
defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) defined(HAVE_ALARM) && \
defined(SIGALRM) && \
defined(HAVE_SIGSETJMP) && \
defined(GLOBAL_INIT_IS_THREADSAFE)
/* alarm-based timeouts can only be used with all the dependencies satisfied */ /* alarm-based timeouts can only be used with all the dependencies satisfied */
#define USE_ALARM_TIMEOUT #define USE_ALARM_TIMEOUT
#endif #endif
#ifdef USE_ALARM_TIMEOUT
#include "easy_lock.h"
#endif
#define MAX_HOSTCACHE_LEN (255 + 7) /* max FQDN + colon + port number + zero */ #define MAX_HOSTCACHE_LEN (255 + 7) /* max FQDN + colon + port number + zero */
/* /*
@ -254,11 +261,12 @@ void Curl_hostcache_prune(struct Curl_easy *data)
Curl_share_unlock(data, CURL_LOCK_DATA_DNS); Curl_share_unlock(data, CURL_LOCK_DATA_DNS);
} }
#ifdef HAVE_SIGSETJMP #ifdef USE_ALARM_TIMEOUT
/* Beware this is a global and unique instance. This is used to store the /* Beware this is a global and unique instance. This is used to store the
return address that we can jump back to from inside a signal handler. This return address that we can jump back to from inside a signal handler. This
is not thread-safe stuff. */ is not thread-safe stuff. */
sigjmp_buf curl_jmpenv; sigjmp_buf curl_jmpenv;
curl_simple_lock curl_jmpenv_lock;
#endif #endif
/* lookup address, returns entry if found and not stale */ /* lookup address, returns entry if found and not stale */
@ -832,7 +840,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data,
static static
void alarmfunc(int sig) void alarmfunc(int sig)
{ {
/* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */
(void)sig; (void)sig;
siglongjmp(curl_jmpenv, 1); siglongjmp(curl_jmpenv, 1);
} }
@ -912,6 +919,8 @@ enum resolve_t Curl_resolv_timeout(struct Curl_easy *data,
This should be the last thing we do before calling Curl_resolv(), This should be the last thing we do before calling Curl_resolv(),
as otherwise we'd have to worry about variables that get modified as otherwise we'd have to worry about variables that get modified
before we invoke Curl_resolv() (and thus use "volatile"). */ before we invoke Curl_resolv() (and thus use "volatile"). */
curl_simple_lock_lock(&curl_jmpenv_lock);
if(sigsetjmp(curl_jmpenv, 1)) { if(sigsetjmp(curl_jmpenv, 1)) {
/* this is coming from a siglongjmp() after an alarm signal */ /* this is coming from a siglongjmp() after an alarm signal */
failf(data, "name lookup timed out"); failf(data, "name lookup timed out");
@ -980,6 +989,8 @@ clean_up:
#endif #endif
#endif /* HAVE_SIGACTION */ #endif /* HAVE_SIGACTION */
curl_simple_lock_unlock(&curl_jmpenv_lock);
/* switch back the alarm() to either zero or to what it was before minus /* switch back the alarm() to either zero or to what it was before minus
the time we spent until now! */ the time we spent until now! */
if(prev_alarm) { if(prev_alarm) {