53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
|
From 9d1099c4ffea481aa803e9cc14a1419f902f52a4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||
|
|
Date: Mon, 29 Jan 2018 19:33:04 +0100
|
||
|
|
Subject: [PATCH] tpm: lookup cancel path under tpm device class
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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 05b71fb207ab7f016e067bd2a40fc0804362eb74)
|
||
|
|
[LY: BSC#1070615]
|
||
|
|
Signed-off-by: Liang Yan <lyan@suse.com>
|
||
|
|
---
|
||
|
|
hw/tpm/tpm_passthrough.c | 10 ++++++++--
|
||
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
|
||
|
|
index c440aff4b2..01ecef99aa 100644
|
||
|
|
--- a/hw/tpm/tpm_passthrough.c
|
||
|
|
+++ b/hw/tpm/tpm_passthrough.c
|
||
|
|
@@ -206,7 +206,8 @@ static TPMVersion tpm_passthrough_get_tpm_version(TPMBackend *tb)
|
||
|
|
* Unless path or file descriptor set has been provided by user,
|
||
|
|
* determine the sysfs cancel file following kernel documentation
|
||
|
|
* 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)
|
||
|
|
{
|
||
|
|
@@ -226,9 +227,14 @@ static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt)
|
||
|
|
dev = strrchr(tpm_pt->tpm_dev, '/');
|
||
|
|
if (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)) {
|
||
|
|
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) {
|
||
|
|
tpm_pt->options->cancel_path = g_strdup(path);
|
||
|
|
} else {
|