dfaggioli/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tpm: lookup cancel path under tpm device class

Browse Source 
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>
(cherry picked from commit 05b71fb207)
[LY: BSC#1079405]
Signed-off-by: Liang Yan <lyan@suse.com>
This commit is contained in:
Marc-André Lureau
2018-01-29 19:33:04 +01:00
committed by Bruce Rogers
parent d78adee7e2
commit 3b9aa00611
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hw/tpm/tpm_passthrough.c
View File

@@ -369,7 +369,8 @@ static TPMVersion tpm_passthrough_get_tpm_version(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(TPMBackend *tb) static int tpm_passthrough_open_sysfs_cancel(TPMBackend *tb)
{ {
@@ -390,10 +391,15 @@ static int tpm_passthrough_open_sysfs_cancel(TPMBackend *tb)
dev = strrchr(tpm_pt->tpm_dev, '/'); dev = strrchr(tpm_pt->tpm_dev, '/');
if (dev) { if (dev) {
dev++; dev++;
if (snprintf(path, sizeof(path), "/sys/class/misc/%s/device/cancel", if (snprintf(path, sizeof(path), "/sys/class/tpm/%s/device/cancel",
dev) < sizeof(path)) { dev) < sizeof(path)) {
fd = qemu_open(path, O_WRONLY); fd = qemu_open(path, O_WRONLY);
if (fd >= 0) { 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) {
tb->cancel_path = g_strdup(path); tb->cancel_path = g_strdup(path);
} else { } else {
error_report("tpm_passthrough: Could not open TPM cancel " error_report("tpm_passthrough: Could not open TPM cancel "