tests: mcumgr: smp_client: Fix double free on test case

smp_client is automatically freeing all net_buf* given for it,
so testcase does not need to call smp_client_buf_free() for
buffers that are processed.

Signed-off-by: Seppo Takalo <[email protected]>

Author: SeppoTakalo

tests/subsys/mgmt/mcumgr/smp_client/src/main.c

@@ -18,8 +18,6 @@
 #include <mgmt/mcumgr/transport/smp_internal.h>
 #include "smp_transport_stub.h"
 
-static struct net_buf *buf[5];
-
 static uint32_t testing_user_data;
 static void *response_ptr;
 static struct net_buf *res_buf;
@@ -35,9 +33,10 @@ int smp_client_res_cb(struct net_buf *nb, void *user_data)
 ZTEST(smp_client, test_buf_alloc)
 {
 	struct smp_client_object smp_client;
+	struct net_buf *buf[5];
 
 	/* Allocate all 4 buffer's and verify that 5th fail */
-	for (int i = 0; i < 5; i++) {
+	for (int i = 0; i < ARRAY_SIZE(buf); i++) {
 		buf[i] = smp_client_buf_allocation(&smp_client, MGMT_GROUP_ID_IMAGE, 1,
 						   MGMT_OP_WRITE, SMP_MCUMGR_VERSION_1);
 		if (i == 4) {
@@ -50,9 +49,11 @@ ZTEST(smp_client, test_buf_alloc)
 		}
 	}
 
-	for (int i = 0; i < 4; i++) {
-		smp_client_buf_free(buf[i]);
-		buf[i] = NULL;
+	for (int i = 0; i < ARRAY_SIZE(buf); i++) {
+		if (buf[i]) {
+			smp_client_buf_free(buf[i]);
+			buf[i] = NULL;
+		}
 	}
 }
 
@@ -75,33 +76,34 @@ ZTEST(smp_client, test_msg_send_timeout)
 ZTEST(smp_client, test_msg_response_handler)
 {
 	struct smp_hdr dst_hdr;
+	struct net_buf *a, *b;
 	int rc;
 
 
 	response_ptr = NULL;
 	res_buf = NULL;
 
-	buf[0] = smp_client_buf_allocation(&smp_client, MGMT_GROUP_ID_IMAGE, 1, MGMT_OP_WRITE,
+	a = smp_client_buf_allocation(&smp_client, MGMT_GROUP_ID_IMAGE, 1, MGMT_OP_WRITE,
 					   SMP_MCUMGR_VERSION_1);
-	zassert_not_null(buf[0], "Buffer was Null");
-	rc = smp_client_send_cmd(&smp_client, buf[0], smp_client_res_cb, &testing_user_data, 8);
+	zassert_not_null(a, "Buffer was Null");
+	rc = smp_client_send_cmd(&smp_client, a, smp_client_res_cb, &testing_user_data, 8);
 	zassert_equal(MGMT_ERR_EOK, rc, "Expected to receive %d response %d", MGMT_ERR_EOK, rc);
-	buf[1] = smp_client_buf_allocation(&smp_client, MGMT_GROUP_ID_IMAGE, 1, MGMT_OP_WRITE,
+	b = smp_client_buf_allocation(&smp_client, MGMT_GROUP_ID_IMAGE, 1, MGMT_OP_WRITE,
 					   SMP_MCUMGR_VERSION_1);
-	zassert_not_null(buf[0], "Buffer was Null");
+	zassert_not_null(b, "Buffer was Null");
 	/* Read Pushed packet Header */
-	smp_transport_read_hdr(buf[0], &dst_hdr);
-	smp_client_single_response(buf[1], &dst_hdr);
+	smp_transport_read_hdr(a, &dst_hdr);
+	smp_client_single_response(b, &dst_hdr);
 	zassert_is_null(res_buf, "NULL pointer was not returned");
 	zassert_is_null(response_ptr, "NULL pointer was not returned");
 	/* Set Correct OP */
 	dst_hdr.nh_op = MGMT_OP_WRITE_RSP;
-	smp_client_single_response(buf[1], &dst_hdr);
-	zassert_equal_ptr(res_buf, buf[1], "Response Buf not correct");
+	smp_client_single_response(b, &dst_hdr);
+	zassert_equal_ptr(res_buf, b, "Response Buf not correct");
 	zassert_equal_ptr(response_ptr, &testing_user_data, "User data not returned correctly");
 	response_ptr = NULL;
 	res_buf = NULL;
-	smp_client_single_response(buf[1], &dst_hdr);
+	smp_client_single_response(b, &dst_hdr);
 	zassert_is_null(res_buf, "NULL pointer was not returned");
 	zassert_is_null(response_ptr, "NULL pointer was not returned");
 }
@@ -114,15 +116,5 @@ static void *setup_custom_os(void)
 	return NULL;
 }
 
-static void cleanup_test(void *p)
-{
-	for (int i = 0; i < 5; i++) {
-		if (buf[i]) {
-			smp_client_buf_free(buf[i]);
-			buf[i] = NULL;
-		}
-	}
-}
-
 /* Main test set */
-ZTEST_SUITE(smp_client, NULL, setup_custom_os, NULL, cleanup_test, NULL);
+ZTEST_SUITE(smp_client, NULL, setup_custom_os, NULL, NULL, NULL);