Coverity/23.12: fix code scan issues (#647) (#649)

Signed-off-by: Ric Li <[email protected]>
OpenVisualCloud · Dec 15, 2023 · 905bae3 · 905bae3
1 parent 611244c
commit 905bae3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/app/sample/fwd/rx_st20p_tx_st20p_downsample_merge_fwd.c b/app/sample/fwd/rx_st20p_tx_st20p_downsample_merge_fwd.c
@@ -59,7 +59,7 @@ static void* tx_st20p_fwd_thread(void* args) {
   struct merge_fwd_sample_ctx* s = args;
   st20p_tx_handle tx_handle = s->tx_handle;
   struct st_frame* frame;
-  struct st_frame down_frame; /* empty temp frame*/
+  struct st_frame down_frame = {0}; /* empty temp frame*/
 
   /* in case when timestamp mismatch */
   struct st_frame* rx_restore_frame = NULL;

diff --git a/include/mtl_api.h b/include/mtl_api.h
@@ -162,18 +162,20 @@ enum mtl_port {
   MTL_PORT_5,     /**< port index: 5 */
   MTL_PORT_6,     /**< port index: 6 */
   MTL_PORT_7,     /**< port index: 7 */
-  MTL_PORT_MAX,   /**< max value of this enum */
 };
 
+#define MTL_PORT_MAX (MTL_PORT_7 + 1)
+
 /**
  * Session port logical type
  */
 enum mtl_session_port {
   MTL_SESSION_PORT_P = 0, /**< primary session(logical) port */
   MTL_SESSION_PORT_R,     /**< redundant session(logical) port */
-  MTL_SESSION_PORT_MAX,   /**< max value of this enum */
 };
 
+#define MTL_SESSION_PORT_MAX (MTL_SESSION_PORT_R + 1)
+
 /**
  * Log level type to MTL context
  */

diff --git a/lib/src/datapath/mt_dp_socket.c b/lib/src/datapath/mt_dp_socket.c
@@ -92,7 +92,7 @@ static uint16_t tx_socket_send_mbuf_gso(struct mt_tx_socket_thread* t,
   int fd = t->fd, ret;
   uint16_t gso_sz = entry->gso_sz;
   struct iovec iovs[nb_pkts];
-  int gso_cnt = 0;
+  uint16_t gso_cnt = 0;
   struct msghdr* msg = &t->msg;
   ssize_t write;
   struct mtl_port_status* stats = mt_if(entry->parent, port)->dev_stats_sw;

diff --git a/lib/src/dev/mt_dev.c b/lib/src/dev/mt_dev.c
@@ -1852,8 +1852,9 @@ int mt_dev_create(struct mtl_main_impl* impl) {
 
   /* create system sch */
   impl->main_sch = mt_sch_get(impl, 0, MT_SCH_TYPE_DEFAULT, MT_SCH_MASK_ALL);
-  if (ret < 0) {
+  if (!impl->main_sch) {
     err("%s, get sch fail\n", __func__);
+    ret = -EIO;
     goto err_exit;
   }
 

diff --git a/lib/src/mt_instance.c b/lib/src/mt_instance.c
@@ -175,7 +175,7 @@ int mt_instance_init(struct mtl_main_impl* impl, struct mtl_init_params* p) {
   mtl_register_message_t* reg_msg = &msg.body.register_msg;
   reg_msg->pid = htonl(u_info->pid);
   reg_msg->uid = htonl(getuid());
-  strncpy(reg_msg->hostname, u_info->hostname, sizeof(reg_msg->hostname));
+  snprintf(reg_msg->hostname, sizeof(reg_msg->hostname), "%s", u_info->hostname);
 
   /* manager will load xdp program for afxdp interfaces */
   uint16_t num_xdp_if = 0;

diff --git a/tests/src/tests.cpp b/tests/src/tests.cpp
@@ -483,7 +483,6 @@ TEST(Misc, hp_malloc_expect_fail) {
   int num_port = st_test_num_port(ctx);
 
   hp_malloc_test(ctx, 0, MTL_PORT_P, false, false);
-  hp_malloc_test(ctx, 8, MTL_PORT_MAX, false, false);
   if (num_port > 1) hp_malloc_test(ctx, 0, MTL_PORT_R, false, false);
 }
 
@@ -492,7 +491,6 @@ TEST(Misc, hp_zmalloc_expect_fail) {
   int num_port = st_test_num_port(ctx);
 
   hp_malloc_test(ctx, 0, MTL_PORT_P, true, false);
-  hp_malloc_test(ctx, 8, MTL_PORT_MAX, true, false);
   if (num_port > 1) hp_malloc_test(ctx, 0, MTL_PORT_R, true, false);
 }
 

diff --git a/tests/src/ufd_test.cpp b/tests/src/ufd_test.cpp
@@ -163,11 +163,7 @@ static void socket_expect_fail_test(enum mtl_port port) {
   EXPECT_LT(ret, 0);
 }
 
-TEST(Api, socket_expect_fail) {
-  socket_expect_fail_test(MTL_PORT_P);
-  int ret = mufd_socket_port(AF_INET, SOCK_STREAM, 0, MTL_PORT_MAX);
-  EXPECT_LT(ret, 0);
-}
+TEST(Api, socket_expect_fail) { socket_expect_fail_test(MTL_PORT_P); }
 TEST(Api, socket_expect_fail_r) { socket_expect_fail_test(MTL_PORT_R); }
 
 static void socket_max_test(enum mtl_port port) {
@@ -309,8 +305,10 @@ static int check_r_port_alive(struct mtl_init_params* p) {
   if (ret < 0) goto out;
 
   while (retry < max_retry) {
-    mufd_sendto(tx_fd, send_buf, sizeof(send_buf), 0, (const struct sockaddr*)&rx_addr,
-                sizeof(rx_addr));
+    if (mufd_sendto(tx_fd, send_buf, sizeof(send_buf), 0,
+                    (const struct sockaddr*)&rx_addr, sizeof(rx_addr)) < 0)
+      warn("%s, send buf fail at %d\n", __func__, retry);
+
     ssize_t recv = mufd_recvfrom(rx_fd, recv_buf, sizeof(recv_buf), 0, NULL, NULL);
     if (recv > 0) {
       info("%s, rx port alive at %d\n", __func__, retry);