xen/xsm: Fix x86 XSM build after commit 6ea9f04
authorJulien Grall <julien.grall@citrix.com>
Mon, 11 May 2015 10:09:24 +0000 (11:09 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Mon, 11 May 2015 10:25:45 +0000 (11:25 +0100)
Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
xen/xsm/flask/flask_op.c

index 802ffd4d7dce17f0287e60d01424442631bda294..8dee0218ac590533c323248c9d1cb86831dbdf88 100644 (file)
@@ -829,10 +829,10 @@ CHECK_flask_setenforce;
 CHECK_flask_transition;
 
 #define COMPAT
-#define flask_copyin_string(ch, pb, sz, mx) ({ \
-       XEN_GUEST_HANDLE_PARAM(char) gh; \
-       guest_from_compat_handle(gh, ch); \
-       flask_copyin_string(gh, pb, sz, mx); \
+#define safe_copy_string_from_guest(ch, sz, mx) ({ \
+    XEN_GUEST_HANDLE_PARAM(char) gh; \
+    guest_from_compat_handle(gh, ch); \
+    safe_copy_string_from_guest(gh, sz, mx); \
 })
 
 #define xen_flask_load compat_flask_load