[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [REPOST v2] [PATCH] tpm: adapt sysfs cancel path for new TP
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [REPOST v2] [PATCH] tpm: adapt sysfs cancel path for new TPM driver |
Date: |
Mon, 21 Mar 2016 10:39:28 -0400 |
This patch addresses BZ 1281413.
Adapt the sysfs TPM command cancel path for the TPM driver that
does not use a miscdevice anymore since Linux 4.0. Support old
and new paths.
Signed-off-by: Stefan Berger <address@hidden>
---
hw/tpm/tpm_passthrough.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index e98efb7..e1edb38 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -377,6 +377,8 @@ static int tpm_passthrough_open_sysfs_cancel(TPMBackend *tb)
int fd = -1;
char *dev;
char path[PATH_MAX];
+ const char *prefix[] = {"misc/", "tpm/"};
+ int i;
if (tb->cancel_path) {
fd = qemu_open(tb->cancel_path, O_WRONLY);
@@ -390,16 +392,21 @@ static int tpm_passthrough_open_sysfs_cancel(TPMBackend
*tb)
dev = strrchr(tpm_pt->tpm_dev, '/');
if (dev) {
dev++;
- 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);
- } else {
- error_report("tpm_passthrough: Could not open TPM cancel "
- "path %s : %s", path, strerror(errno));
+ for (i = 0; i < ARRAY_SIZE(prefix); i++) {
+ if (snprintf(path, sizeof(path),
+ "/sys/class/%s%s/device/cancel",
+ prefix[i], dev) < sizeof(path)) {
+ fd = qemu_open(path, O_WRONLY);
+ if (fd >= 0) {
+ tb->cancel_path = g_strdup(path);
+ break;
+ }
}
}
+ if (fd < 0) {
+ error_report("tpm_passthrough: Could not open TPM cancel "
+ "path %s : %s", path, strerror(errno));
+ }
} else {
error_report("tpm_passthrough: Bad TPM device path %s",
tpm_pt->tpm_dev);
--
2.4.3
- [Qemu-devel] [REPOST v2] [PATCH] tpm: adapt sysfs cancel path for new TPM driver,
Stefan Berger <=