From: Stefan Berger <stefanb@linux.ibm.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Stefan Berger <stefanb@linux.vnet.ibm.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH 5/6] tests/qtest/tpm-tests: Remove unnecessary NULL checks
Date: Tue, 25 May 2021 12:14:08 -0400 [thread overview]
Message-ID: <306e148f-79c3-4f95-3cf3-c6b0437c88f6@linux.ibm.com> (raw)
In-Reply-To: <20210525134458.6675-6-peter.maydell@linaro.org>
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);
> }
next prev parent reply other threads:[~2021-05-25 17:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 13:44 [PATCH 0/6] tests: Fix some minor Coverity issues Peter Maydell
2021-05-25 13:44 ` [PATCH 1/6] tests/qtest/bios-tables-test: Check for dup2() failure Peter Maydell
2021-05-25 16:15 ` Stefan Berger
2021-05-25 13:44 ` [PATCH 2/6] tests/qtest/e1000e-test: Check qemu_recv() succeeded Peter Maydell
2021-05-25 16:15 ` Stefan Berger
2021-05-25 13:44 ` [PATCH 3/6] tests/qtest/hd-geo-test: Fix checks on mkstemp() return value Peter Maydell
2021-05-25 13:59 ` Philippe Mathieu-Daudé
2021-05-25 16:14 ` Stefan Berger
2021-05-25 13:44 ` [PATCH 4/6] tests/qtest/pflash-cfi02-test: Avoid potential integer overflow Peter Maydell
2021-05-25 14:00 ` Philippe Mathieu-Daudé
2021-05-25 16:14 ` Stefan Berger
2021-05-25 13:44 ` [PATCH 5/6] tests/qtest/tpm-tests: Remove unnecessary NULL checks Peter Maydell
2021-05-25 14:00 ` Philippe Mathieu-Daudé
2021-05-25 16:14 ` Stefan Berger [this message]
2021-05-25 13:44 ` [PATCH 6/6] tests/unit/test-vmstate: Assert that dup() and mkstemp() succeed Peter Maydell
2021-05-25 14:02 ` Philippe Mathieu-Daudé
2021-05-25 16:13 ` Stefan Berger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=306e148f-79c3-4f95-3cf3-c6b0437c88f6@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).