[Xen-devel] [PATCH 3/4 v3] xenconsole: Change the type of ring_ref to xen_pfn_t in console_create_ring

[Bhupinder Thakur <bhupinder.thakur@xxxxxxxxxx>]

Currently, ring_ref is read as an integer in console_create_ring which could 
lead to
truncation of the value as it is reading a 64-bit value.

The fix is to modify the type of ring_ref to xen_pfn_t and use the correct 
format
specifier to read the value correctly for all architectures.

Signed-off-by: Bhupinder Thakur <bhupinder.thakur@xxxxxxxxxx>
Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
CC: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Julien Grall <julien.grall@xxxxxxx>

This patch is as per the review of commit fa1f157
    libxl: Fix the bug introduced in commit "libxl: use correct type

 tools/console/daemon/io.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index e22009a..1839973 100644
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -19,6 +19,7 @@
 
 #define _GNU_SOURCE
 
+#include <inttypes.h>
 #include "utils.h"
 #include "io.h"
 #include <xenevtchn.h>
@@ -81,6 +82,12 @@ static unsigned int nr_fds;
 
 #define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1))
 
+#if defined(CONFIG_ARM)
+# define SCNi_xen_pfn SCNi64
+#else
+# define SCNi_xen_pfn "li"
+#endif
+
 struct buffer {
        char *data;
        size_t consumed;
@@ -98,7 +105,7 @@ struct console {
        struct buffer buffer;
        char *xspath;
        char *log_suffix;
-       int ring_ref;
+       xen_pfn_t ring_ref;
        xenevtchn_handle *xce_handle;
        int xce_pollfd_idx;
        int event_count;
@@ -661,12 +668,13 @@ static void console_unmap_interface(struct console *con)
  
 static int console_create_ring(struct console *con)
 {
-       int err, remote_port, ring_ref, rc;
+       int err, remote_port, rc;
+       xen_pfn_t ring_ref;
        char *type, path[PATH_MAX];
        struct domain *dom = con->d;
 
        err = xs_gather(xs, con->xspath,
-                       "ring-ref", "%u", &ring_ref,
+                       "ring-ref", "%"SCNi_xen_pfn, &ring_ref,
                        "port", "%i", &remote_port,
                        NULL);
 
@@ -705,7 +713,7 @@ static int console_create_ring(struct console *con)
                con->interface = xc_map_foreign_range(
                        xc, dom->domid, XC_PAGE_SIZE,
                        PROT_READ|PROT_WRITE,
-                       (unsigned long)ring_ref);
+                       ring_ref);
                if (con->interface == NULL) {
                        err = EINVAL;
                        goto out;
-- 
2.7.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel