[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/6] tests/qtest/tpm-tests: Remove unnecessary NULL checks
From: |
Peter Maydell |
Subject: |
[PATCH 5/6] tests/qtest/tpm-tests: Remove unnecessary NULL checks |
Date: |
Tue, 25 May 2021 14:44:57 +0100 |
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(-)
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);
}
--
2.20.1
- [PATCH 1/6] tests/qtest/bios-tables-test: Check for dup2() failure, (continued)
- [PATCH 1/6] tests/qtest/bios-tables-test: Check for dup2() failure, Peter Maydell, 2021/05/25
- [PATCH 2/6] tests/qtest/e1000e-test: Check qemu_recv() succeeded, Peter Maydell, 2021/05/25
- [PATCH 4/6] tests/qtest/pflash-cfi02-test: Avoid potential integer overflow, Peter Maydell, 2021/05/25
- [PATCH 3/6] tests/qtest/hd-geo-test: Fix checks on mkstemp() return value, Peter Maydell, 2021/05/25
- [PATCH 5/6] tests/qtest/tpm-tests: Remove unnecessary NULL checks,
Peter Maydell <=
- [PATCH 6/6] tests/unit/test-vmstate: Assert that dup() and mkstemp() succeed, Peter Maydell, 2021/05/25