[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/42] tpm-emulator: fix error handling
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 15/42] tpm-emulator: fix error handling |
Date: |
Tue, 10 Oct 2017 00:55:56 +0200 |
The previous patch cleaned up a bit error handling, and exposed an
existing bug: error_report_err() could be called with a NULL error.
Instead, make tpm_emulator_set_locality() set the error.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/tpm/tpm_emulator.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index 788ab9876d..25a6258c10 100644
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -141,7 +141,8 @@ static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_emu,
return 0;
}
-static int tpm_emulator_set_locality(TPMEmulator *tpm_emu, uint8_t
locty_number)
+static int tpm_emulator_set_locality(TPMEmulator *tpm_emu, uint8_t
locty_number,
+ Error **errp)
{
ptm_loc loc;
@@ -155,15 +156,15 @@ static int tpm_emulator_set_locality(TPMEmulator
*tpm_emu, uint8_t locty_number)
loc.u.req.loc = locty_number;
if (tpm_emulator_ctrlcmd(&tpm_emu->ctrl_chr, CMD_SET_LOCALITY, &loc,
sizeof(loc), sizeof(loc)) < 0) {
- error_report("tpm-emulator: could not set locality : %s",
- strerror(errno));
+ error_setg(errp, "tpm-emulator: could not set locality : %s",
+ strerror(errno));
return -1;
}
loc.u.resp.tpm_result = be32_to_cpu(loc.u.resp.tpm_result);
if (loc.u.resp.tpm_result != 0) {
- error_report("tpm-emulator: TPM result for set locality : 0x%x",
- loc.u.resp.tpm_result);
+ error_setg(errp, "tpm-emulator: TPM result for set locality : 0x%x",
+ loc.u.resp.tpm_result);
return -1;
}
@@ -179,7 +180,8 @@ static void tpm_emulator_handle_request(TPMBackend *tb,
TPMBackendCmd *cmd)
DPRINTF("processing TPM command");
- if (tpm_emulator_set_locality(tpm_emu, tb->tpm_state->locty_number) < 0) {
+ if (tpm_emulator_set_locality(tpm_emu,
+ tb->tpm_state->locty_number, &err) < 0) {
goto error;
}
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH 11/42] tpm: remove unused TPMBackendCmd, (continued)
- [Qemu-devel] [PATCH 11/42] tpm: remove unused TPMBackendCmd, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 12/42] tpm: remove needless cast, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 13/42] tpm: remove locty argument from receive_cb, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 14/42] tpm: add TPMBackendCmd to hold the request state, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 16/42] tpm: remove locty_data from TPMState, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 15/42] tpm-emulator: fix error handling,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 17/42] tpm-tis: move TPMState to TIS header, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 18/42] tpm-tis: remove tpm_tis.h header, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 19/42] tpm-tis: fold TPMTISEmuState in TPMState, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 20/42] tpm: add a QOM TPM interface, Marc-André Lureau, 2017/10/09