imv-scanner: Properly check snprintf() return value
[strongswan.git] / src / libimcv / plugins / imv_scanner / imv_scanner_agent.c
index b164054..d1e0931 100644 (file)
@@ -255,20 +255,26 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
                return TNC_RESULT_SUCCESS;
        }
 
+       /* create an empty out message - we might need it */
+       out_msg = imv_msg_create(this->agent, state, id, imv_id, TNC_IMCID_ANY,
+                                                        msg_types[0]);
+
        if (!session)
        {
                DBG2(DBG_IMV, "no workitems available - no evaluation possible");
                state->set_recommendation(state,
                                                        TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
                                                        TNC_IMV_EVALUATION_RESULT_DONT_KNOW);
-               scanner_state->set_handshake_state(scanner_state,
-                                                       IMV_SCANNER_STATE_END);
-               return TNC_RESULT_SUCCESS;
-       }
+               result = out_msg->send_assessment(out_msg);
+               out_msg->destroy(out_msg);
+               scanner_state->set_handshake_state(scanner_state, IMV_SCANNER_STATE_END);
 
-       /* create an empty out message - we might need it */
-       out_msg = imv_msg_create(this->agent, state, id, imv_id, TNC_IMCID_ANY,
-                                                        msg_types[0]);
+               if (result != TNC_RESULT_SUCCESS)
+               {
+                       return result;
+               }
+               return this->agent->provide_recommendation(this->agent, state);
+       }
 
        if (handshake_state == IMV_SCANNER_STATE_INIT)
        {
@@ -326,7 +332,8 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
                u_int16_t port;
                bool closed_port_policy, blocked, first;
                char result_str[BUF_LEN], *pos, *protocol_str;
-               size_t len, written;
+               size_t len;
+               int written;
                linked_list_t *port_list;
                enumerator_t *e1, *e2;
 
@@ -404,12 +411,15 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
                                        {
                                                written = snprintf(pos, len, "violating %s ports:",
                                                                                                          protocol_str);
-                                               pos += written;
-                                               len -= written;
+                                               if (written > 0 && written < len)
+                                               {
+                                                       pos += written;
+                                                       len -= written;
+                                               }
                                                first = FALSE;
                                        }
                                        written = snprintf(pos, len, " %u", port);
-                                       if (written > len || written < 0)
+                                       if (written < 0 || written >= len)
                                        {
                                                pos += len - 1;
                                                *pos = '\0';
@@ -436,20 +446,21 @@ METHOD(imv_agent_if_t, batch_ending, TNC_Result,
                        workitem->destroy(workitem);
                }
                enumerator->destroy(enumerator);
+       }
+
+       /* finalized all workitems ? */
+       if (handshake_state == IMV_SCANNER_STATE_WORKITEMS &&
+               session->get_workitem_count(session, imv_id) == 0)
+       {
+               result = out_msg->send_assessment(out_msg);
+               out_msg->destroy(out_msg);
+               scanner_state->set_handshake_state(scanner_state, IMV_SCANNER_STATE_END);
 
-               /* finalized all workitems ? */
-               if (session->get_workitem_count(session, imv_id) == 0)
+               if (result != TNC_RESULT_SUCCESS)
                {
-                       scanner_state->set_handshake_state(scanner_state,
-                                                                                          IMV_SCANNER_STATE_END);
-                       result = out_msg->send_assessment(out_msg);
-                       out_msg->destroy(out_msg);
-                       if (result != TNC_RESULT_SUCCESS)
-                       {
-                               return result;
-                       }
-                       return this->agent->provide_recommendation(this->agent, state);
+                       return result;
                }
+               return this->agent->provide_recommendation(this->agent, state);
        }
 
        /* send non-empty PA-TNC message with excl flag not set */
@@ -496,7 +507,7 @@ imv_agent_if_t *imv_scanner_agent_create(const char *name, TNC_IMVID id,
        {
                return NULL;
        }
-       
+
        INIT(this,
                .public = {
                        .bind_functions = _bind_functions,