diff mbox series

[1/3] tests/qtest/tpm-util.c: Free memory with correct free function

Message ID 20210503165525.26221-2-peter.maydell@linaro.org
State Accepted
Headers show
Series tests: three easy Coverity fixes | expand

Commit Message

Peter Maydell May 3, 2021, 4:55 p.m. UTC
tpm_util_migration_start_qemu() allocates memory with g_strdup_printf()
but frees it with free() rather than g_free(), which provokes Coverity
complaints (CID 1432379, 1432350). Use the correct free function.

Fixes: Coverity CID 1432379, CID 1432350
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
With newer glib (2.46 and up) g_free() is guaranteed to be the same
as free(), but matching things up is neater anyway.
---
 tests/qtest/tpm-util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

Comments

Stefan Berger May 3, 2021, 4:59 p.m. UTC | #1
On 5/3/21 12:55 PM, Peter Maydell wrote:
> tpm_util_migration_start_qemu() allocates memory with g_strdup_printf()

> but frees it with free() rather than g_free(), which provokes Coverity

> complaints (CID 1432379, 1432350). Use the correct free function.

>

> Fixes: Coverity CID 1432379, CID 1432350

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

> With newer glib (2.46 and up) g_free() is guaranteed to be the same

> as free(), but matching things up is neater anyway.

> ---

>   tests/qtest/tpm-util.c | 4 ++--

>   1 file changed, 2 insertions(+), 2 deletions(-)

>

> diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c

> index b70cc32d600..3a40ff3f96c 100644

> --- a/tests/qtest/tpm-util.c

> +++ b/tests/qtest/tpm-util.c

> @@ -289,6 +289,6 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,

>

>       *dst_qemu = qtest_init(dst_qemu_args);

>

> -    free(src_qemu_args);

> -    free(dst_qemu_args);

> +    g_free(src_qemu_args);

> +    g_free(dst_qemu_args);

>   }



Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Alex Bennée May 4, 2021, 8:44 a.m. UTC | #2
Peter Maydell <peter.maydell@linaro.org> writes:

> tpm_util_migration_start_qemu() allocates memory with g_strdup_printf()

> but frees it with free() rather than g_free(), which provokes Coverity

> complaints (CID 1432379, 1432350). Use the correct free function.

>

> Fixes: Coverity CID 1432379, CID 1432350

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

> With newer glib (2.46 and up) g_free() is guaranteed to be the same

> as free(), but matching things up is neater anyway.

> ---

>  tests/qtest/tpm-util.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

>

> diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c

> index b70cc32d600..3a40ff3f96c 100644

> --- a/tests/qtest/tpm-util.c

> +++ b/tests/qtest/tpm-util.c

> @@ -289,6 +289,6 @@ void tpm_util_migration_start_qemu(QTestState **src_qemu,

>  

>      *dst_qemu = qtest_init(dst_qemu_args);

>  

> -    free(src_qemu_args);

> -    free(dst_qemu_args);

> +    g_free(src_qemu_args);

> +    g_free(dst_qemu_args);

>  }


The more modern approach would be to use g_autofree but this works given
we aren't dealing with multiple exits:

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


-- 
Alex Bennée
diff mbox series

Patch

diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
index b70cc32d600..3a40ff3f96c 100644
--- a/tests/qtest/tpm-util.c
+++ b/tests/qtest/tpm-util.c
@@ -289,6 +289,6 @@  void tpm_util_migration_start_qemu(QTestState **src_qemu,
 
     *dst_qemu = qtest_init(dst_qemu_args);
 
-    free(src_qemu_args);
-    free(dst_qemu_args);
+    g_free(src_qemu_args);
+    g_free(dst_qemu_args);
 }