[PATCH v2 0/3] Some coverity fixes for xl/libxl

[PATCH v2 0/3] Some coverity fixes for xl/libxl

[Wei Liu]

v2: use _mandatory variant

Wei Liu (3):
  libxl: use libxl__read_xenstore_mandatory in vtpm function
  libxl: use libxl__read_xenstore_mandatory in vdispl function
  xl: avoid leaking memory in vdispl parser

 tools/libxl/libxl_vdispl.c | 8 ++++++--
 tools/libxl/libxl_vtpm.c   | 7 +++++--
 tools/xl/xl_parse.c        | 2 ++
 3 files changed, 13 insertions(+), 4 deletions(-)

-- 
2.11.0


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

[PATCH v2 1/3] libxl: use libxl__read_xenstore_mandatory in vtpm function

[Wei Liu]

libxl__read_xenstore can return NULL. Use the _mandatory variant to
return early when the read fails.

Coverity-ID: 1418098

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxl/libxl_vtpm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_vtpm.c b/tools/libxl/libxl_vtpm.c
index 21320870d4..6182cfc49c 100644
--- a/tools/libxl/libxl_vtpm.c
+++ b/tools/libxl/libxl_vtpm.c
@@ -79,12 +79,15 @@ static int libxl__vtpm_from_xenstore(libxl__gc *gc, const char *libxl_path,
                                      libxl_device_vtpm *vtpm)
 {
     int rc;
-    char *be_path;
+    const char *be_path;
     char *uuid;
 
     vtpm->devid = devid;
 
-    be_path = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/backend", libxl_path));
+    rc = libxl__xs_read_mandatory(gc, XBT_NULL,
+                                  GCSPRINTF("%s/backend", libxl_path),
+                                  &be_path);
+    if (rc) return rc;
 
     rc = libxl__backendpath_parse_domid(gc, be_path, &vtpm->backend_domid);
     if (rc) return rc;
-- 
2.11.0


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

[PATCH v2 2/3] libxl: use libxl__read_xenstore_mandatory in vdispl function

[Wei Liu]

Coverity-ID: 1418097

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/libxl/libxl_vdispl.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_vdispl.c b/tools/libxl/libxl_vdispl.c
index 5740c89fad..befc56bdeb 100644
--- a/tools/libxl/libxl_vdispl.c
+++ b/tools/libxl/libxl_vdispl.c
@@ -40,10 +40,14 @@ static int libxl__vdispl_from_xenstore(libxl__gc *gc, const char *libxl_path,
                                        libxl_devid devid,
                                        libxl_device_vdispl *vdispl)
 {
-    char *be_path;
+    const char *be_path;
+    int rc;
 
     vdispl->devid = devid;
-    be_path = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/backend", libxl_path));
+    rc = libxl__xs_read_mandatory(gc, XBT_NULL,
+                                  GCSPRINTF("%s/backend", libxl_path),
+                                  &be_path);
+    if (rc) return rc;
 
     return libxl__backendpath_parse_domid(gc, be_path, &vdispl->backend_domid);
 }
-- 
2.11.0


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

[PATCH v2 3/3] xl: avoid leaking memory in vdispl parser

[Wei Liu]

Coverity-ID: 1418095

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 tools/xl/xl_parse.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 9965b83c44..0678fbc1b0 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -832,6 +832,8 @@ int parse_vdispl_config(libxl_device_vdispl *vdispl, char *token)
 
             rc= sscanf(resolution, "%ux%u", &vdispl->connectors[i].width,
                        &vdispl->connectors[i].height);
+            free(resolution);
+
             if (rc != 2) {
                 fprintf(stderr, "Can't parse connector resolution\n");
                 goto out;
-- 
2.11.0


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

Re: [PATCH v2 0/3] Some coverity fixes for xl/libxl

[Ian Jackson]

Wei Liu writes ("[PATCH v2 0/3] Some coverity fixes for xl/libxl"):
> v2: use _mandatory variant

All three

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

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