Improve error handling around thread attribute calls.

ismailfaruk · Nov 8, 2023 · 0b1be25 · 0b1be25
1 parent a360f70
commit 0b1be25
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/iperf_api.h b/src/iperf_api.h
@@ -460,6 +460,8 @@ enum {
     IEPTHREADCREATE=150,	// Unable to create thread (check perror)
     IEPTHREADCANCEL=151,        // Unable to cancel thread (check perror)
     IEPTHREADJOIN=152,		// Unable to join thread (check perror)
+    IEPTHREADATTRINIT=153,      // Unable to initialize thread attribute (check perror)
+    IEPTHREADATTRDESTROY=154,      // Unable to destroy thread attribute (check perror)
     /* Stream errors */
     IECREATESTREAM = 200,   // Unable to create a new stream (check herror/perror)
     IEINITSTREAM = 201,     // Unable to initialize stream (check herror/perror)

diff --git a/src/iperf_client_api.c b/src/iperf_client_api.c
@@ -636,7 +636,10 @@ iperf_run_client(struct iperf_test * test)
 
                 /* Create and spin up threads */
                 pthread_attr_t attr;
-                pthread_attr_init(&attr);
+                if (pthread_attr_init(&attr) != 0) {
+                    i_errno = IEPTHREADATTRINIT;
+                    goto cleanup_and_fail;
+                }
 
                 SLIST_FOREACH(sp, &test->streams, streams) {
                     if (pthread_create(&(sp->thr), &attr, &iperf_client_worker_start, sp) != 0) {
@@ -650,7 +653,10 @@ iperf_run_client(struct iperf_test * test)
                 if (test->debug_level >= DEBUG_LEVEL_INFO) {
                     iperf_printf(test, "All threads created\n");
                 }
-                pthread_attr_destroy(&attr);
+                if (pthread_attr_destroy(&attr) != 0) {
+                    i_errno = IEPTHREADATTRDESTROY;
+                    goto cleanup_and_fail;
+                }
 
 		// Set non-blocking for non-UDP tests
 		if (test->protocol->id != Pudp) {

diff --git a/src/iperf_error.c b/src/iperf_error.c
@@ -482,6 +482,14 @@ iperf_strerror(int int_errno)
             snprintf(errstr, len, "unable to join thread");
             perr = 1;
             break;
+	case IEPTHREADATTRINIT:
+            snprintf(errstr, len, "unable to create thread attributes");
+            perr = 1;
+            break;
+	case IEPTHREADATTRDESTROY:
+            snprintf(errstr, len, "unable to destroy thread attributes");
+            perr = 1;
+            break;
 	default:
 	    snprintf(errstr, len, "int_errno=%d", int_errno);
 	    perr = 1;

diff --git a/src/iperf_server_api.c b/src/iperf_server_api.c
@@ -840,7 +840,10 @@ iperf_run_server(struct iperf_test *test)
 
                     /* Create and spin up threads */
                     pthread_attr_t attr;
-                    pthread_attr_init(&attr);
+                    if (pthread_attr_init(&attr) != 0) {
+                        i_errno = IEPTHREADATTRINIT;
+                        cleanup_server(test);
+                    };
 
                     SLIST_FOREACH(sp, &test->streams, streams) {
                         if (pthread_create(&(sp->thr), &attr, &iperf_server_worker_start, sp) != 0) {
@@ -855,7 +858,10 @@ iperf_run_server(struct iperf_test *test)
                     if (test->debug_level >= DEBUG_LEVEL_INFO) {
                         iperf_printf(test, "All threads created\n");
                     }
-                    pthread_attr_destroy(&attr);
+                    if (pthread_attr_destroy(&attr) != 0) {
+                        i_errno = IEPTHREADATTRDESTROY;
+                        cleanup_server(test);
+                    };
                 }
             }