|
@@ -123,12 +123,14 @@ static const char *tpm_emulator_strerror(uint32_t tpm_result)
|
|
}
|
|
}
|
|
|
|
|
|
static int tpm_emulator_ctrlcmd(TPMEmulator *tpm, unsigned long cmd, void *msg,
|
|
static int tpm_emulator_ctrlcmd(TPMEmulator *tpm, unsigned long cmd, void *msg,
|
|
- size_t msg_len_in, size_t msg_len_out)
|
|
|
|
|
|
+ size_t msg_len_in, size_t msg_len_out_err,
|
|
|
|
+ size_t msg_len_out_total)
|
|
{
|
|
{
|
|
CharBackend *dev = &tpm->ctrl_chr;
|
|
CharBackend *dev = &tpm->ctrl_chr;
|
|
uint32_t cmd_no = cpu_to_be32(cmd);
|
|
uint32_t cmd_no = cpu_to_be32(cmd);
|
|
ssize_t n = sizeof(uint32_t) + msg_len_in;
|
|
ssize_t n = sizeof(uint32_t) + msg_len_in;
|
|
uint8_t *buf = NULL;
|
|
uint8_t *buf = NULL;
|
|
|
|
+ ptm_res res;
|
|
|
|
|
|
WITH_QEMU_LOCK_GUARD(&tpm->mutex) {
|
|
WITH_QEMU_LOCK_GUARD(&tpm->mutex) {
|
|
buf = g_alloca(n);
|
|
buf = g_alloca(n);
|
|
@@ -140,8 +142,25 @@ static int tpm_emulator_ctrlcmd(TPMEmulator *tpm, unsigned long cmd, void *msg,
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
- if (msg_len_out != 0) {
|
|
|
|
- n = qemu_chr_fe_read_all(dev, msg, msg_len_out);
|
|
|
|
|
|
+ if (msg_len_out_total > 0) {
|
|
|
|
+ assert(msg_len_out_total >= msg_len_out_err);
|
|
|
|
+
|
|
|
|
+ n = qemu_chr_fe_read_all(dev, (uint8_t *)msg, msg_len_out_err);
|
|
|
|
+ if (n <= 0) {
|
|
|
|
+ return -1;
|
|
|
|
+ }
|
|
|
|
+ if (msg_len_out_err == msg_len_out_total) {
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ /* result error code is always in the first 4 bytes */
|
|
|
|
+ assert(sizeof(res) <= msg_len_out_err);
|
|
|
|
+ memcpy(&res, msg, sizeof(res));
|
|
|
|
+ if (res) {
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ n = qemu_chr_fe_read_all(dev, (uint8_t *)msg + msg_len_out_err,
|
|
|
|
+ msg_len_out_total - msg_len_out_err);
|
|
if (n <= 0) {
|
|
if (n <= 0) {
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
@@ -204,7 +223,8 @@ static int tpm_emulator_set_locality(TPMEmulator *tpm_emu, uint8_t locty_number,
|
|
memset(&loc, 0, sizeof(loc));
|
|
memset(&loc, 0, sizeof(loc));
|
|
loc.u.req.loc = locty_number;
|
|
loc.u.req.loc = locty_number;
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_LOCALITY, &loc,
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_LOCALITY, &loc,
|
|
- sizeof(loc), sizeof(loc)) < 0) {
|
|
|
|
|
|
+ sizeof(loc), sizeof(loc.u.resp.tpm_result),
|
|
|
|
+ sizeof(loc)) < 0) {
|
|
error_setg(errp, "tpm-emulator: could not set locality : %s",
|
|
error_setg(errp, "tpm-emulator: could not set locality : %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
return -1;
|
|
return -1;
|
|
@@ -241,8 +261,9 @@ static int tpm_emulator_probe_caps(TPMEmulator *tpm_emu)
|
|
{
|
|
{
|
|
ptm_cap_n cap_n;
|
|
ptm_cap_n cap_n;
|
|
|
|
|
|
- if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_CAPABILITY,
|
|
|
|
- &cap_n, 0, sizeof(cap_n)) < 0) {
|
|
|
|
|
|
+ if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_CAPABILITY, &cap_n, 0,
|
|
|
|
+ sizeof(cap_n.u.resp.tpm_result),
|
|
|
|
+ sizeof(cap_n)) < 0) {
|
|
error_report("tpm-emulator: probing failed : %s", strerror(errno));
|
|
error_report("tpm-emulator: probing failed : %s", strerror(errno));
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
@@ -292,7 +313,8 @@ static int tpm_emulator_stop_tpm(TPMBackend *tb)
|
|
TPMEmulator *tpm_emu = TPM_EMULATOR(tb);
|
|
TPMEmulator *tpm_emu = TPM_EMULATOR(tb);
|
|
ptm_res res;
|
|
ptm_res res;
|
|
|
|
|
|
- if (tpm_emulator_ctrlcmd(tpm_emu, CMD_STOP, &res, 0, sizeof(res)) < 0) {
|
|
|
|
|
|
+ if (tpm_emulator_ctrlcmd(tpm_emu, CMD_STOP, &res, 0,
|
|
|
|
+ sizeof(ptm_res), sizeof(res)) < 0) {
|
|
error_report("tpm-emulator: Could not stop TPM: %s",
|
|
error_report("tpm-emulator: Could not stop TPM: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
return -1;
|
|
return -1;
|
|
@@ -319,8 +341,9 @@ static int tpm_emulator_lock_storage(TPMEmulator *tpm_emu)
|
|
|
|
|
|
/* give failing side 300 * 10ms time to release lock */
|
|
/* give failing side 300 * 10ms time to release lock */
|
|
pls.u.req.retries = cpu_to_be32(300);
|
|
pls.u.req.retries = cpu_to_be32(300);
|
|
- if (tpm_emulator_ctrlcmd(tpm_emu, CMD_LOCK_STORAGE, &pls,
|
|
|
|
- sizeof(pls.u.req), sizeof(pls.u.resp)) < 0) {
|
|
|
|
|
|
+ if (tpm_emulator_ctrlcmd(tpm_emu, CMD_LOCK_STORAGE, &pls, sizeof(pls.u.req),
|
|
|
|
+ sizeof(pls.u.resp.tpm_result),
|
|
|
|
+ sizeof(pls.u.resp)) < 0) {
|
|
error_report("tpm-emulator: Could not lock storage within 3 seconds: "
|
|
error_report("tpm-emulator: Could not lock storage within 3 seconds: "
|
|
"%s", strerror(errno));
|
|
"%s", strerror(errno));
|
|
return -1;
|
|
return -1;
|
|
@@ -351,7 +374,8 @@ static int tpm_emulator_set_buffer_size(TPMBackend *tb,
|
|
psbs.u.req.buffersize = cpu_to_be32(wanted_size);
|
|
psbs.u.req.buffersize = cpu_to_be32(wanted_size);
|
|
|
|
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_BUFFERSIZE, &psbs,
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_BUFFERSIZE, &psbs,
|
|
- sizeof(psbs.u.req), sizeof(psbs.u.resp)) < 0) {
|
|
|
|
|
|
+ sizeof(psbs.u.req), sizeof(psbs.u.resp.tpm_result),
|
|
|
|
+ sizeof(psbs.u.resp)) < 0) {
|
|
error_report("tpm-emulator: Could not set buffer size: %s",
|
|
error_report("tpm-emulator: Could not set buffer size: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
return -1;
|
|
return -1;
|
|
@@ -398,6 +422,7 @@ static int tpm_emulator_startup_tpm_resume(TPMBackend *tb, size_t buffersize,
|
|
}
|
|
}
|
|
|
|
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_INIT, &init, sizeof(init),
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_INIT, &init, sizeof(init),
|
|
|
|
+ sizeof(init.u.resp.tpm_result),
|
|
sizeof(init)) < 0) {
|
|
sizeof(init)) < 0) {
|
|
error_report("tpm-emulator: could not send INIT: %s",
|
|
error_report("tpm-emulator: could not send INIT: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
@@ -439,8 +464,9 @@ static bool tpm_emulator_get_tpm_established_flag(TPMBackend *tb)
|
|
return tpm_emu->established_flag;
|
|
return tpm_emu->established_flag;
|
|
}
|
|
}
|
|
|
|
|
|
- if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_TPMESTABLISHED, &est,
|
|
|
|
- 0, sizeof(est)) < 0) {
|
|
|
|
|
|
+ if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_TPMESTABLISHED, &est, 0,
|
|
|
|
+ sizeof(est) /* always returns resp.bit */,
|
|
|
|
+ sizeof(est)) < 0) {
|
|
error_report("tpm-emulator: Could not get the TPM established flag: %s",
|
|
error_report("tpm-emulator: Could not get the TPM established flag: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
return false;
|
|
return false;
|
|
@@ -468,6 +494,7 @@ static int tpm_emulator_reset_tpm_established_flag(TPMBackend *tb,
|
|
reset_est.u.req.loc = tpm_emu->cur_locty_number;
|
|
reset_est.u.req.loc = tpm_emu->cur_locty_number;
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_RESET_TPMESTABLISHED,
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_RESET_TPMESTABLISHED,
|
|
&reset_est, sizeof(reset_est),
|
|
&reset_est, sizeof(reset_est),
|
|
|
|
+ sizeof(reset_est.u.resp.tpm_result),
|
|
sizeof(reset_est)) < 0) {
|
|
sizeof(reset_est)) < 0) {
|
|
error_report("tpm-emulator: Could not reset the establishment bit: %s",
|
|
error_report("tpm-emulator: Could not reset the establishment bit: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
@@ -499,7 +526,7 @@ static void tpm_emulator_cancel_cmd(TPMBackend *tb)
|
|
|
|
|
|
/* FIXME: make the function non-blocking, or it may block a VCPU */
|
|
/* FIXME: make the function non-blocking, or it may block a VCPU */
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_CANCEL_TPM_CMD, &res, 0,
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_CANCEL_TPM_CMD, &res, 0,
|
|
- sizeof(res)) < 0) {
|
|
|
|
|
|
+ sizeof(ptm_res), sizeof(res)) < 0) {
|
|
error_report("tpm-emulator: Could not cancel command: %s",
|
|
error_report("tpm-emulator: Could not cancel command: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
} else if (res != 0) {
|
|
} else if (res != 0) {
|
|
@@ -559,7 +586,7 @@ static int tpm_emulator_prepare_data_fd(TPMEmulator *tpm_emu)
|
|
qemu_chr_fe_set_msgfds(&tpm_emu->ctrl_chr, fds + 1, 1);
|
|
qemu_chr_fe_set_msgfds(&tpm_emu->ctrl_chr, fds + 1, 1);
|
|
|
|
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_DATAFD, &res, 0,
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_DATAFD, &res, 0,
|
|
- sizeof(res)) < 0 || res != 0) {
|
|
|
|
|
|
+ sizeof(ptm_res), sizeof(res)) < 0 || res != 0) {
|
|
error_report("tpm-emulator: Failed to send CMD_SET_DATAFD: %s",
|
|
error_report("tpm-emulator: Failed to send CMD_SET_DATAFD: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
goto err_exit;
|
|
goto err_exit;
|
|
@@ -706,6 +733,8 @@ static int tpm_emulator_get_state_blob(TPMEmulator *tpm_emu,
|
|
|
|
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_STATEBLOB,
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_STATEBLOB,
|
|
&pgs, sizeof(pgs.u.req),
|
|
&pgs, sizeof(pgs.u.req),
|
|
|
|
+ /* always returns up to resp.data */
|
|
|
|
+ offsetof(ptm_getstate, u.resp.data),
|
|
offsetof(ptm_getstate, u.resp.data)) < 0) {
|
|
offsetof(ptm_getstate, u.resp.data)) < 0) {
|
|
error_report("tpm-emulator: could not get state blob type %d : %s",
|
|
error_report("tpm-emulator: could not get state blob type %d : %s",
|
|
type, strerror(errno));
|
|
type, strerror(errno));
|
|
@@ -808,7 +837,7 @@ static int tpm_emulator_set_state_blob(TPMEmulator *tpm_emu,
|
|
|
|
|
|
/* write the header only */
|
|
/* write the header only */
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_STATEBLOB, &pss,
|
|
if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_STATEBLOB, &pss,
|
|
- offsetof(ptm_setstate, u.req.data), 0) < 0) {
|
|
|
|
|
|
+ offsetof(ptm_setstate, u.req.data), 0, 0) < 0) {
|
|
error_report("tpm-emulator: could not set state blob type %d : %s",
|
|
error_report("tpm-emulator: could not set state blob type %d : %s",
|
|
type, strerror(errno));
|
|
type, strerror(errno));
|
|
return -1;
|
|
return -1;
|
|
@@ -992,7 +1021,8 @@ static void tpm_emulator_shutdown(TPMEmulator *tpm_emu)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SHUTDOWN, &res, 0, sizeof(res)) < 0) {
|
|
|
|
|
|
+ if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SHUTDOWN, &res, 0,
|
|
|
|
+ sizeof(ptm_res), sizeof(res)) < 0) {
|
|
error_report("tpm-emulator: Could not cleanly shutdown the TPM: %s",
|
|
error_report("tpm-emulator: Could not cleanly shutdown the TPM: %s",
|
|
strerror(errno));
|
|
strerror(errno));
|
|
} else if (res != 0) {
|
|
} else if (res != 0) {
|