ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm: lookup cancel path under tpm device class 

Since Linux commit 313d21eeab9282e, tpm devices have their own device
class "tpm" and the cancel path must be looked up under
/sys/class/tpm/ instead of /sys/class/misc/.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Marc-André Lureau 2018-01-29 19:33:04 +01:00 committed by Stefan Berger
parent cc1b6c5533
commit 05b71fb207
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/tpm/tpm_passthrough.c
View File

@ -214,7 +214,8 @@ static size_t tpm_passthrough_get_buffer_size(TPMBackend *tb)
* Unless path or file descriptor set has been provided by user, * Unless path or file descriptor set has been provided by user,
* determine the sysfs cancel file following kernel documentation * determine the sysfs cancel file following kernel documentation
* in Documentation/ABI/stable/sysfs-class-tpm. * in Documentation/ABI/stable/sysfs-class-tpm.
* From /dev/tpm0 create /sys/class/misc/tpm0/device/cancel * From /dev/tpm0 create /sys/class/tpm/tpm0/device/cancel
* before 4.0: /sys/class/misc/tpm0/device/cancel
*/ */
static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt) static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt)
{ {
@ -225,26 +226,35 @@ static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt)
if (tpm_pt->options->cancel_path) { if (tpm_pt->options->cancel_path) {
fd = qemu_open(tpm_pt->options->cancel_path, O_WRONLY); fd = qemu_open(tpm_pt->options->cancel_path, O_WRONLY);
if (fd < 0) { if (fd < 0) {
error_report("Could not open TPM cancel path : %s", error_report("tpm_passthrough: Could not open TPM cancel path: %s",
strerror(errno)); strerror(errno));
} }
return fd; return fd;
} }
dev = strrchr(tpm_pt->tpm_dev, '/'); dev = strrchr(tpm_pt->tpm_dev, '/');
if (dev) { if (!dev) {
dev++; error_report("tpm_passthrough: Bad TPM device path %s",
if (snprintf(path, sizeof(path), "/sys/class/misc/%s/device/cancel", tpm_pt->tpm_dev);
dev) < sizeof(path)) { return -1;
fd = qemu_open(path, O_WRONLY); }
if (fd < 0) {
error_report("tpm_passthrough: Could not open TPM cancel " dev++;
"path %s : %s", path, strerror(errno)); if (snprintf(path, sizeof(path), "/sys/class/tpm/%s/device/cancel",
dev) < sizeof(path)) {
fd = qemu_open(path, O_WRONLY);
if (fd < 0) {
if (snprintf(path, sizeof(path), "/sys/class/misc/%s/device/cancel",
dev) < sizeof(path)) {
fd = qemu_open(path, O_WRONLY);
} }
} }
}
if (fd < 0) {
error_report("tpm_passthrough: Could not guess TPM cancel path");
} else { } else {
error_report("tpm_passthrough: Bad TPM device path %s", tpm_pt->options->cancel_path = g_strdup(path);
tpm_pt->tpm_dev);
} }
return fd; return fd;