Commit 6d3c880a25790ea24ede68271b44b3481ee77b3d
2012-10-22T22:48:12
Make sure to check pool stratum curl exists under lock before attempting any recv to not risk dereferencing upon attempting to reinitiate stratum.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
diff --git a/util.c b/util.c
index cfcb16b..9877afe 100644
--- a/util.c
+++ b/util.c
@@ -866,7 +866,8 @@ bool extract_sockaddr(struct pool *pool, char *url)
return true;
}
-/* Send a single command across a socket, appending \n to it */
+/* Send a single command across a socket, appending \n to it. This should all
+ * be done under stratum lock except when first establishing the socket */
static bool __stratum_send(struct pool *pool, char *s, ssize_t len)
{
SOCKETTYPE sock = pool->sock;
@@ -880,6 +881,7 @@ static bool __stratum_send(struct pool *pool, char *s, ssize_t len)
while (len > 0 ) {
struct timeval timeout = {0, 0};
+ CURLcode rc = CURLE_SEND_ERROR;
size_t sent = 0;
fd_set wd;
@@ -889,7 +891,9 @@ static bool __stratum_send(struct pool *pool, char *s, ssize_t len)
applog(LOG_DEBUG, "Write select failed on pool %d sock", pool->pool_no);
return false;
}
- if (curl_easy_send(pool->stratum_curl, s + ssent, len, &sent) != CURLE_OK) {
+ if (likely(pool->stratum_curl))
+ rc = curl_easy_send(pool->stratum_curl, s + ssent, len, &sent);
+ if (rc != CURLE_OK) {
applog(LOG_DEBUG, "Failed to curl_easy_send in stratum_send");
return false;
}
@@ -916,9 +920,14 @@ bool stratum_send(struct pool *pool, char *s, ssize_t len)
static void clear_sock(struct pool *pool)
{
- SOCKETTYPE sock = pool->sock;
+ size_t n = 0;
- recv(sock, pool->sockbuf, RECVSIZE, MSG_DONTWAIT);
+ mutex_lock(&pool->stratum_lock);
+ /* Ignore return code of curl_easy_recv since we're just clearing
+ * anything in the socket if it's still alive */
+ if (likely(pool->stratum_curl))
+ curl_easy_recv(pool->stratum_curl, pool->sockbuf, RECVSIZE, &n);
+ mutex_unlock(&pool->stratum_lock);
strcpy(pool->sockbuf, "");
}
@@ -950,12 +959,12 @@ char *recv_line(struct pool *pool)
{
ssize_t len, buflen;
char *tok, *sret = NULL;
- size_t n;
+ size_t n = 0;
if (!strstr(pool->sockbuf, "\n")) {
+ CURLcode rc = CURLE_RECV_ERROR;
char s[RBUFSIZE];
size_t sspace;
- CURLcode rc;
if (!sock_full(pool, true)) {
applog(LOG_DEBUG, "Timed out waiting for data on sock_full");
@@ -964,7 +973,8 @@ char *recv_line(struct pool *pool)
memset(s, 0, RBUFSIZE);
mutex_lock(&pool->stratum_lock);
- rc = curl_easy_recv(pool->stratum_curl, s, RECVSIZE, &n);
+ if (likely(pool->stratum_curl))
+ rc = curl_easy_recv(pool->stratum_curl, s, RECVSIZE, &n);
mutex_unlock(&pool->stratum_lock);
if (rc != CURLE_OK) {