| Message ID | 20210525134458.6675-6-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests: Fix some minor Coverity issues | expand |
On 5/25/21 3:44 PM, Peter Maydell wrote: > Coverity points out that in tpm_test_swtpm_migration_test() we > assume that src_tpm_addr and dst_tpm_addr are non-NULL (we > pass them to tpm_util_migration_start_qemu() which will > unconditionally dereference them) but then later explicitly > check them for NULL. Remove the pointless checks. > > Fixes: Coverity CID 1432367, 1432359 > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > tests/qtest/tpm-tests.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 5/25/21 9:44 AM, Peter Maydell wrote: > Coverity points out that in tpm_test_swtpm_migration_test() we > assume that src_tpm_addr and dst_tpm_addr are non-NULL (we > pass them to tpm_util_migration_start_qemu() which will > unconditionally dereference them) but then later explicitly > check them for NULL. Remove the pointless checks. > > Fixes: Coverity CID 1432367, 1432359 > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > --- > tests/qtest/tpm-tests.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c > index 0da3a8a4df5..25073d1f9e9 100644 > --- a/tests/qtest/tpm-tests.c > +++ b/tests/qtest/tpm-tests.c > @@ -123,14 +123,10 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path, > qtest_quit(src_qemu); > > tpm_util_swtpm_kill(dst_tpm_pid); > - if (dst_tpm_addr) { > - g_unlink(dst_tpm_addr->u.q_unix.path); > - qapi_free_SocketAddress(dst_tpm_addr); > - } > + g_unlink(dst_tpm_addr->u.q_unix.path); > + qapi_free_SocketAddress(dst_tpm_addr); > > tpm_util_swtpm_kill(src_tpm_pid); > - if (src_tpm_addr) { > - g_unlink(src_tpm_addr->u.q_unix.path); > - qapi_free_SocketAddress(src_tpm_addr); > - } > + g_unlink(src_tpm_addr->u.q_unix.path); > + qapi_free_SocketAddress(src_tpm_addr); > }
diff --git a/tests/qtest/tpm-tests.c b/tests/qtest/tpm-tests.c index 0da3a8a4df5..25073d1f9e9 100644 --- a/tests/qtest/tpm-tests.c +++ b/tests/qtest/tpm-tests.c @@ -123,14 +123,10 @@ void tpm_test_swtpm_migration_test(const char *src_tpm_path, qtest_quit(src_qemu); tpm_util_swtpm_kill(dst_tpm_pid); - if (dst_tpm_addr) { - g_unlink(dst_tpm_addr->u.q_unix.path); - qapi_free_SocketAddress(dst_tpm_addr); - } + g_unlink(dst_tpm_addr->u.q_unix.path); + qapi_free_SocketAddress(dst_tpm_addr); tpm_util_swtpm_kill(src_tpm_pid); - if (src_tpm_addr) { - g_unlink(src_tpm_addr->u.q_unix.path); - qapi_free_SocketAddress(src_tpm_addr); - } + g_unlink(src_tpm_addr->u.q_unix.path); + qapi_free_SocketAddress(src_tpm_addr); }
Coverity points out that in tpm_test_swtpm_migration_test() we assume that src_tpm_addr and dst_tpm_addr are non-NULL (we pass them to tpm_util_migration_start_qemu() which will unconditionally dereference them) but then later explicitly check them for NULL. Remove the pointless checks. Fixes: Coverity CID 1432367, 1432359 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- tests/qtest/tpm-tests.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)