8:25 a.m.
Implement helper functions to find the TPM's sysfs cancel file.
Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com>
Reviewed-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com>
Tested-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com>
---
po/POTFILES.in | 1
src/Makefile.am | 1
src/libvirt_private.syms | 4 +
src/util/virtpm.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++
src/util/virtpm.h | 27 ++++++++++
5 files changed, 155 insertions(+)
Index: libvirt/src/Makefile.am
===================================================================
--- libvirt.orig/src/Makefile.am
+++ libvirt/src/Makefile.am
@@ -122,6 +122,7 @@ UTIL_SOURCES = \
util/virthreadwin32.h \
util/virthreadpool.c util/virthreadpool.h \
util/virtime.h util/virtime.c \
+ util/virtpm.h util/virtpm.c \
util/virtypedparam.c util/virtypedparam.h \
util/virusb.c util/virusb.h \
util/viruri.h util/viruri.c \
Index: libvirt/src/util/virtpm.c
===================================================================
--- /dev/null
+++ libvirt/src/util/virtpm.c
@@ -0,0 +1,122 @@
+/*
+ * virtpm.c: TPM support
+ *
+ * Copyright (C) 2013 IBM Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>;.
+ *
+ * Author: Stefan Berger <stefanb(a)linux.vnet.ibm.com>
+ */
+
+#include <config.h>
+
+#include <sys/stat.h>
+
+#include "c-ctype.h"
+#include "virobject.h"
+#include "viralloc.h"
+#include "virutil.h"
+#include "virerror.h"
+#include "virbuffer.h"
+#include "virtpm.h"
+
+#define VIR_FROM_THIS VIR_FROM_NONE
+
+/*
+ * Check whether the given base path, e.g., /sys/class/misc/tpm0/device,
+ * is the sysfs entry of a TPM. A TPM sysfs entry should be uniquely
+ * recognizable by the file entries 'pcrs' and 'cancel'.
+ * Upon success the basepath with '/cancel' appended is returned, NULL
+ * otherwise.
+ */
+static char *
+virTPMCheckSysfsCancel(char *basepath)
+{
+ char *path = NULL;
+ struct stat statbuf;
+
+ if (virAsprintf(&path, "%s/pcrs", basepath) < 0) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ if (stat(path, &statbuf) == -1 || !S_ISREG(statbuf.st_mode)) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Could not determine TPM cancel path since pcrs "
+ "file was not found in directory %s"),
+ basepath);
+ goto cleanup;
+ }
+
+ VIR_FREE(path);
+
+ if (virAsprintf(&path, "%s/cancel", basepath) < 0) {
+ virReportOOMError();
+ goto cleanup;
+ }
+
+ if (stat(path, &statbuf) == -1 || !S_ISREG(statbuf.st_mode)) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Could not determine TPM cancel path since cancel "
+ "file was not found in directory %s"),
+ basepath);
+ goto cleanup;
+ }
+
+ return path;
+
+cleanup:
+ VIR_FREE(path);
+ return NULL;
+}
+
+
+/**
+ * virTPMFindCancelPath:
+ * @devpath: Path to the TPM device
+ *
+ * Find the cancel path given the path to the TPM device
+ */
+char *
+virTPMFindCancelPath(const char *devpath)
+{
+ char *basepath = NULL;
+ char *path = NULL;
+ const char *dev;
+
+ if (devpath) {
+ dev = strrchr(devpath, '/');
+ if (dev) {
+ dev++;
+ if (virAsprintf(&basepath, "/sys/class/misc/%s/device",
+ dev) < 0) {
+ virReportOOMError();
+ goto cleanup;
+ }
+ path = virTPMCheckSysfsCancel(basepath);
+ } else {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("TPM device path %s is invalid"), devpath);
+ }
+ } else {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Missing TPM device path"));
+ }
+
+cleanup:
+ VIR_FREE(basepath);
+
+ return path;
+}
Index: libvirt/src/libvirt_private.syms
===================================================================
--- libvirt.orig/src/libvirt_private.syms
+++ libvirt/src/libvirt_private.syms
@@ -1781,6 +1781,10 @@ virTimeStringThen;
virTimeStringThenRaw;
+# util/virtpm.h
+virTPMFindCancelPath;
+
+
# util/virtypedparam.h
virTypedParameterArrayValidate;
virTypedParameterAssign;
Index: libvirt/src/util/virtpm.h
===================================================================
--- /dev/null
+++ libvirt/src/util/virtpm.h
@@ -0,0 +1,27 @@
+/*
+ * virtpm.h: TPM support
+ *
+ * Copyright (C) 2013 IBM Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>;.
+ *
+ * Author: Stefan Berger <stefanb(a)linux.vnet.ibm.com>
+ */
+#ifndef __VIR_TPM_H__
+# define __VIR_TPM_H__
+
+char *virTPMFindCancelPath(const char *devpath);
+
+#endif /* __VIR_TPM_H__ */
Index: libvirt/po/POTFILES.in
===================================================================
--- libvirt.orig/po/POTFILES.in
+++ libvirt/po/POTFILES.in
@@ -181,6 +181,7 @@ src/util/virsysinfo.c
src/util/virerror.c
src/util/virerror.h
src/util/virtime.c
+src/util/virtpm.c
src/util/virtypedparam.c
src/util/viruri.c
src/util/virusb.c