Fix minor xencontrol issues

- Fix mismatched XcStoreRead() function signatures
- Fix memory leak in XcOpen()
- Fix IOCTL names in error messages

Signed-off-by: Rafał Wojdyła <omeg@invisiblethingslab.com>

diff --git a/include/xencontrol.h b/include/xencontrol.h
index 4560bc68984ed99ccb5b7a0004c5a9f3c652342b..29cd208b5c72669a95571c5f5fa538743910a43c 100644 (file)
--- a/include/xencontrol.h
+++ b/include/xencontrol.h
@@ -244,7 +244,7 @@ XENCONTROL_API
 DWORD
 XcStoreRead(
     IN  PXENCONTROL_CONTEXT Xc,
-    IN  PCHAR Path,
+    IN  PSTR Path,
     IN  DWORD cbValue,
     OUT CHAR *Value
     );

diff --git a/src/xencontrol/xencontrol.c b/src/xencontrol/xencontrol.c
index 777fd297c47288a73413767337a0df310c5dc3ee..5cd94612efebde4fdf57bd208741335f2e7c2a78 100644 (file)
--- a/src/xencontrol/xencontrol.c
+++ b/src/xencontrol/xencontrol.c
@@ -168,6 +168,8 @@ fail:
          L"Error: 0x%x", GetLastError());
 
     free(DetailData);
+    free(Context);
+    *Xc = NULL;
     return GetLastError();
 }
 
@@ -208,7 +210,7 @@ XcEvtchnOpenUnbound(
                               NULL);
 
     if (!Success) {
-        Log(XLL_ERROR, L"IOCTL_XENIFACE_EVTCHN_BIND_UNBOUND_PORT failed");
+        Log(XLL_ERROR, L"IOCTL_XENIFACE_EVTCHN_BIND_UNBOUND failed");
         goto fail;
     }
 
@@ -442,11 +444,11 @@ XcGnttabPermitForeignAccess(
     // this IOCTL is expected to be pending on success
     if (!Success) {
         if (Status != ERROR_IO_PENDING) {
-            Log(XLL_ERROR, L"IOCTL_XENIFACE_GNTTAB_GRANT_PAGES failed");
+            Log(XLL_ERROR, L"IOCTL_XENIFACE_GNTTAB_PERMIT_FOREIGN_ACCESS failed");
             goto fail;
         }
     } else {
-        Log(XLL_ERROR, L"IOCTL_XENIFACE_GNTTAB_GRANT_PAGES not pending");
+        Log(XLL_ERROR, L"IOCTL_XENIFACE_GNTTAB_PERMIT_FOREIGN_ACCESS not pending");
         Status = ERROR_UNIDENTIFIED_ERROR;
         goto fail;
     }
@@ -506,7 +508,7 @@ XcGnttabRevokeForeignAccess(
 
     Status = GetLastError();
     if (!Success) {
-        Log(XLL_ERROR, L"IOCTL_XENIFACE_GNTTAB_UNGRANT_PAGES failed");
+        Log(XLL_ERROR, L"IOCTL_XENIFACE_GNTTAB_REVOKE_FOREIGN_ACCESS failed");
         goto fail;
     }