From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 2 Jun 2016 15:10:31 +0000 (+0100)
Subject: libxl: Cleanup: use libxl__backendpath_parse_domid in libxl__device_disk_from_xs_be
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1034
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=03273df2ecbe04bdb16dab1b6dacf8175a0fe84a;p=xen.git

libxl: Cleanup: use libxl__backendpath_parse_domid in libxl__device_disk_from_xs_be

Rather than an open-coded sscanf.  No functional change with correct
input.

This is a followup to XSA-175 and XSA-178.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index d5475ed7d8..006b83ff75 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2658,10 +2658,10 @@ static int libxl__device_disk_from_xenstore(libxl__gc *gc,
         goto out;
     }
 
-    rc = sscanf(backend_path, "/local/domain/%d/", &disk->backend_domid);
-    if (rc != 1) {
+    rc = libxl__backendpath_parse_domid(gc, backend_path, &disk->backend_domid);
+    if (rc) {
         LOG(ERROR, "Unable to fetch device backend domid from %s", backend_path);
-        goto cleanup;
+        goto out;
     }
 
     /*